LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Removed redundant launcher icon reference." into jb-mr2-dev

Browse Source
This commit is contained in:
Fred Chung
2013-07-22 18:37:53 +00:00
committed by Android (Google) Code Review
parent 63bc4aaf4c 6758cf0530
commit 19dd9d200c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/AppRestrictions/AndroidManifest.xml
View File

@@ -24,10 +24,7 @@
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:icon="@drawable/ic_launcher"> android:icon="@drawable/ic_launcher">
<activity android:name="CustomRestrictionsActivity"
android:label="@string/restrictions_activity_label" />
<activity android:name="MainActivity" <activity android:name="MainActivity"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" > android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -35,6 +32,9 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="CustomRestrictionsActivity"
android:label="@string/restrictions_activity_label" />
<receiver android:name="GetRestrictionsReceiver"> <receiver android:name="GetRestrictionsReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.GET_RESTRICTION_ENTRIES" /> <action android:name="android.intent.action.GET_RESTRICTION_ENTRIES" />