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

Commit 4ffca2a8 authored by Doris Ling's avatar Doris Ling
Browse files

Remove Battery Dashboad alias. 

- merge Battery Dashboard metadata into PowerUsageSummary and remove
  Battery Dashboard alias.

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I7ed2e297f6b897e65b1bce2c9a5f426b51507e9c
parent 3ee0f4f5

AndroidManifest.xml

+2 −13
Original line number Diff line number Diff line
@@ -2213,11 +2213,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

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

            </intent-filter>

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

                android:value="com.android.settings.category.device" />

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

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

                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />

        </activity>
@@ -3034,17 +3034,6 @@ 
                       android:value="@string/app_and_notification_dashboard_summary"/>

        </activity>



        <activity-alias android:name="BatteryDashboardAlias"

                        android:targetActivity="Settings$PowerUsageSummaryActivity">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.fuelgauge.PowerUsageSummary"/>

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

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

        </activity-alias>



        <activity android:name=".Settings$StorageDashboardActivity"

                  android:label="@string/storage_settings"

                  android:icon="@drawable/ic_dashboard_storage">

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ public class SettingsGateway { 
            Settings.NetworkDashboardActivity.class.getName(),

            Settings.ConnectedDeviceDashboardActivity.class.getName(),

            Settings.AppAndNotificationDashboardActivity.class.getName(),

            "com.android.settings.BatteryDashboardAlias",

            "com.android.settings.SoundDashboardAlias",

            "com.android.settings.SecurityDashboardAlias",

            "com.android.settings.UsersDashboardAlias",