Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb52b951 authored by Steve Kondik's avatar Steve Kondik
Browse files

systemui: Enable navbar tuner 

 * And add an action for it.

Change-Id: I23a51cc8e33f3498deec9ed60281423c66bbc4ca
parent 5b2b5de0

packages/SystemUI/AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -261,6 +261,19 @@ 
            </intent-filter>

        </activity-alias>



        <activity-alias android:name=".tuner.NavBarTuner"

                  android:targetActivity=".tuner.TunerActivity"

                  android:icon="@drawable/tuner"

                  android:theme="@style/TunerSettings"

                  android:label="@string/nav_bar"

                  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>



        <!-- Service used by secondary users to register themselves with the system user. -->

        <service android:name=".recents.RecentsSystemUserService"

            android:exported="false"

packages/SystemUI/res/xml/tuner_prefs.xml

+0 −2
Original line number Diff line number Diff line
@@ -128,12 +128,10 @@ 


    </PreferenceScreen>



    <!--

    <Preference

        android:key="nav_bar"

        android:title="@string/nav_bar"

        android:fragment="com.android.systemui.tuner.NavBarTuner" />

    -->



    <Preference

            android:key="other"

packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -41,9 +41,11 @@ public class TunerActivity extends SettingsDrawerActivity implements 
                    "com.android.settings.action.DEMO_MODE");

            boolean showNightMode = getIntent().getBooleanExtra(

                    NightModeFragment.EXTRA_SHOW_NIGHT_MODE, false);

            final PreferenceFragment fragment = showNightMode ? new NightModeFragment()

            boolean showNavBar = action != null && action.equals(

                    "com.android.settings.action.NAV_BAR_TUNER");

            final Fragment fragment = showNightMode ? new NightModeFragment()

                    : showDemoMode ? new DemoModeFragment()

                    : new TunerFragment();

                    : showNavBar ? new NavBarTuner() : new TunerFragment();

            getFragmentManager().beginTransaction().replace(R.id.content_frame,

                    fragment, TAG_TUNER).commit();

        }