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

Merge commit '0b849a70'

Browse Source 
Resolve conflict.

Conflicts:
	AndroidManifest.xml
This commit is contained in:
Baligh Uddin
2013-08-02 14:51:33 -07:00
parent 8f09a57604 0b849a704b
commit dbf91c105a
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

@@ -797,7 +797,6 @@
android:value="com.android.settings.NotificationStation" />
</activity>
<!--
<activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings"
android:taskAffinity=""
@@ -806,15 +805,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"