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

am 497c8938: Merge change I24a40dc2 into eclair

Browse Source 
Merge commit '497c89387a3f9730a637b2f506dcd447266992e2' into eclair-mr2

* commit '497c89387a3f9730a637b2f506dcd447266992e2':
  Put launcher2 back into its own process.  bug 2241963
This commit is contained in:
Joe Onorato
2009-11-05 20:28:15 -08:00
committed by Android Git Automerger
parent ec4bd95854 497c89387a
commit cbca934496
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
-1
View File
@@ -22,7 +22,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := Launcher2 LOCAL_PACKAGE_NAME := Launcher2
LOCAL_CERTIFICATE := shared
LOCAL_OVERRIDES_PACKAGES := Launcher LOCAL_OVERRIDES_PACKAGES := Launcher
AndroidManifest.xml
+1 -3
View File
@@ -20,8 +20,7 @@
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.launcher2" package="com.android.launcher2"
android:sharedUserId="android.uid.shared" >
android:sharedUserLabel="@string/uid_name">
<permission <permission
android:name="com.android.launcher.permission.INSTALL_SHORTCUT" android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
@@ -62,7 +61,6 @@
<application <application
android:name="LauncherApplication" android:name="LauncherApplication"
android:process="android.process.acore"
android:label="@string/application_name" android:label="@string/application_name"
android:icon="@drawable/ic_launcher_home"> android:icon="@drawable/ic_launcher_home">