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

Commit 38b47251 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add a temporary activity-alias for TunerActivity. 

Bug: 31781480
Test: make SystemUI, and manually inspected sysui appears in
Settings. Turning off sysui tuner still works.

The new alias is used by Settings to display sysui tuner in a different
category instead of in homepage directly. The display location is
controlled by category metadata. We need a alias because the category
metadata is different between new/old activity.

Change-Id: Ie4f2c1f6017459e34227155c83a7767f2003b18b
parent 4e9db787

packages/SystemUI/AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -247,6 +247,18 @@ 
                    android:value="com.android.settings.category.system" />

        </activity>



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

                        android:targetActivity=".tuner.TunerActivity"

                        android:enabled="false"

                        android:process=":tuner">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system" />

        </activity-alias>



        <activity-alias android:name=".DemoMode"

                  android:targetActivity=".tuner.TunerActivity"

                  android:icon="@drawable/tuner"

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ public class TunerActivity extends SettingsDrawerActivity implements 
        PreferenceFragment.OnPreferenceStartFragmentCallback,

        PreferenceFragment.OnPreferenceStartScreenCallback {



    static final String ACTIVITY_ALIAS_NAME = "com.android.systemui.tuner.TunerSettingLink";



    private static final String TAG_TUNER = "tuner";



    protected void onCreate(Bundle savedInstanceState) {

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

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,12 @@ public class TunerService extends SystemUI { 
                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                        : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                        PackageManager.DONT_KILL_APP);



        userContext(context).getPackageManager().setComponentEnabledSetting(

                new ComponentName(context, TunerActivity.ACTIVITY_ALIAS_NAME),

                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                        : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.DONT_KILL_APP);

    }



    public static final boolean isTunerEnabled(Context context) {