PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Battery Dashboad alias.

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

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I7ed2e297f6b897e65b1bce2c9a5f426b51507e9c
This commit is contained in:
Doris Ling
2017-03-01 10:47:21 -08:00
parent 3ee0f4f5d0
commit 4ffca2a8e5
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AndroidManifest.xml
View File

@@ -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">

1
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -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",