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

am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

Browse Source 
* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
  Revert "Completely remove app ops activity."
This commit is contained in:
Dave Burke
2013-08-02 13:42:04 -07:00
committed by Android Git Automerger
parent 99d5938cf2 1a32d47793
commit 0b849a704b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

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