From 9637515689cd6ef518949ddeb818fe0ae2fbff46 Mon Sep 17 00:00:00 2001 From: ezio84 <brabus84@gmail.com> Date: Fri, 16 Nov 2018 05:23:06 -0600 Subject: [PATCH] Navbar: Allow the launch navbar fragment externally [nift4: use activity alias instead] Change-Id: I6204ee33d73c56bf24cc41dcfb453db536e301e2 Signed-off-by: SagarMakhar <sagarmakhar@gmail.com> Signed-off-by: spezi77 <spezi7713@gmx.net> --- packages/SystemUI/LMODroidManifest.xml | 14 ++++++++++++++ packages/SystemUI/res/values/lmodroid_strings.xml | 3 +++ packages/SystemUI/res/xml/nav_bar_tuner.xml | 2 +- .../com/android/systemui/tuner/TunerActivity.java | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/LMODroidManifest.xml b/packages/SystemUI/LMODroidManifest.xml index f10bd0d8d5a8..2cb455a8b793 100644 --- a/packages/SystemUI/LMODroidManifest.xml +++ b/packages/SystemUI/LMODroidManifest.xml @@ -42,6 +42,20 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity-alias> + <activity-alias + android:name=".tuner.NavbarActivity" + android:targetActivity=".tuner.TunerActivity" + android:enabled="true" + android:icon="@drawable/tuner" + android:theme="@style/Theme.SubSettingsBase" + android:label="@string/systemui_tuner_navbar_title" + android:process=":tuner" + android:exported="true"> + <intent-filter> + <action android:name="com.android.settings.action.NAV_BAR_TUNER" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity-alias> </application> </manifest> diff --git a/packages/SystemUI/res/values/lmodroid_strings.xml b/packages/SystemUI/res/values/lmodroid_strings.xml index 0ada878cd403..e7da5cf19163 100644 --- a/packages/SystemUI/res/values/lmodroid_strings.xml +++ b/packages/SystemUI/res/values/lmodroid_strings.xml @@ -87,6 +87,9 @@ <!-- Name of the VoWiFi status bar icon. --> <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string> + <!-- Navbar --> + <string name="systemui_tuner_navbar_title">Layout</string> + <!-- WiFi standard numbering on statusbar --> <string name="status_bar_wifi_standard">Wi-Fi standard number</string> diff --git a/packages/SystemUI/res/xml/nav_bar_tuner.xml b/packages/SystemUI/res/xml/nav_bar_tuner.xml index 68e8fad1e24a..ff423ca26bc8 100644 --- a/packages/SystemUI/res/xml/nav_bar_tuner.xml +++ b/packages/SystemUI/res/xml/nav_bar_tuner.xml @@ -16,7 +16,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:sysui="http://schemas.android.com/apk/res-auto" - android:title="@string/nav_bar"> + android:title="@string/systemui_tuner_navbar_title"> <com.android.systemui.tuner.RadioListPreference android:key="layout" diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java index 1796bf21afdd..642ea5807aa8 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java @@ -64,6 +64,8 @@ public class TunerActivity extends CollapsingToolbarBaseActivity implements fragment = new DemoModeFragment(mDemoModeController, mGlobalSettings); } else if ("com.android.settings.action.STATUS_BAR_TUNER".equals(action)) { fragment = new StatusBarTuner(); + } else if ("com.android.settings.action.NAV_BAR_TUNER".equals(action)) { + fragment = new NavBarTuner(); } else { fragment = new TunerFragment(); } -- GitLab