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

Merge "Remove Battery Dashboad alias."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-01 20:55:53 +00:00
committed by Android (Google) Code Review
parent 021e7bc69b 4ffca2a8e5
commit 58240e6a52
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

@@ -2215,11 +2215,11 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
<intent-filter android:priority="4"> <intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.fuelgauge.PowerUsageSummary" /> android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
</activity> </activity>
@@ -3016,17 +3016,6 @@
android:value="@string/app_and_notification_dashboard_summary"/> android:value="@string/app_and_notification_dashboard_summary"/>
</activity> </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" <activity android:name=".Settings$StorageDashboardActivity"
android:label="@string/storage_settings" android:label="@string/storage_settings"
android:icon="@drawable/ic_dashboard_storage"> android:icon="@drawable/ic_dashboard_storage">

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

@@ -274,7 +274,6 @@ public class SettingsGateway {
Settings.NetworkDashboardActivity.class.getName(), Settings.NetworkDashboardActivity.class.getName(),
Settings.ConnectedDeviceDashboardActivity.class.getName(), Settings.ConnectedDeviceDashboardActivity.class.getName(),
Settings.AppAndNotificationDashboardActivity.class.getName(), Settings.AppAndNotificationDashboardActivity.class.getName(),
"com.android.settings.BatteryDashboardAlias",
"com.android.settings.SoundDashboardAlias", "com.android.settings.SoundDashboardAlias",
"com.android.settings.SecurityDashboardAlias", "com.android.settings.SecurityDashboardAlias",
"com.android.settings.UsersDashboardAlias", "com.android.settings.UsersDashboardAlias",