commit 4ffca2a8e576e5f172dcb68781f10007c2725763
author Doris Ling <dling@google.com> Wed Mar 01 10:47:21 2017 -0800
committer Doris Ling <dling@google.com> Wed Mar 01 10:49:10 2017 -0800
tree 51775863f4a00a1cb6e10079d360172a9cd16458
parent 3ee0f4f5d08976d79ad74b34fcaafa5bc2c5156b

Remove Battery Dashboad alias.

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

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I7ed2e297f6b897e65b1bce2c9a5f426b51507e9c

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbf4739..a3728fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 02eb0e9..a9c3c50 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -280,7 +280,6 @@
             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",