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

Merge "Turn on new battery settings page"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-24 03:10:27 +00:00
committed by Android (Google) Code Review
parent b04556453a b96ccba79d
commit 7f8ffff06f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AndroidManifest.xml
View File

@@ -2228,12 +2228,15 @@
android:label="@string/power_usage_summary_title" android:label="@string/power_usage_summary_title"
android:icon="@drawable/ic_settings_battery" android:icon="@drawable/ic_settings_battery"
android:enabled="false"> android:enabled="false">
<!-- TODO(b/69867246): add priority for this intent-filter --> <intent-filter android:priority="1">
<intent-filter>
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" /> <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<!-- TODO(b/69867246): add shortcut intent-filter --> <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<intent-filter android:priority="8"> <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>
@@ -2255,15 +2258,10 @@
<activity android:name=".Settings$PowerUsageSummaryLegacyActivity" <activity android:name=".Settings$PowerUsageSummaryLegacyActivity"
android:label="@string/power_usage_summary_title" android:label="@string/power_usage_summary_title"
android:icon="@drawable/ic_settings_battery"> android:icon="@drawable/ic_settings_battery">
<intent-filter android:priority="1"> <intent-filter>
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" /> <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<intent-filter android:priority="8"> <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>