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

Merge "Completely remove app ops activity." into jb-mr2-dev

Browse Source
This commit is contained in:
Sascha Prueter
2013-08-01 20:55:38 +00:00
committed by Android (Google) Code Review
parent 0cb5701106 1ad26e9c37
commit d346fce268
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -794,6 +794,7 @@
android:value="com.android.settings.NotificationStation" /> android:value="com.android.settings.NotificationStation" />
</activity> </activity>
<!--
<activity android:name="Settings$AppOpsSummaryActivity" <activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings" android:label="@string/app_ops_settings"
android:taskAffinity="" android:taskAffinity=""
@@ -802,17 +803,15 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APP_OPS_SETTINGS" /> <action android:name="android.settings.APP_OPS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<!-- Not yet ready to expose.
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
-->
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppOpsSummary" /> android:value="com.android.settings.applications.AppOpsSummary" />
<!--
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/application_settings" /> --> android:resource="@id/application_settings" />
</activity> </activity>
-->
<activity android:name="Settings$LocationSettingsActivity" <activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title" android:label="@string/location_settings_title"