OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing adaptive icon bounds caching
[android-x86/packages-apps-Launcher3.git]
/
AndroidManifest.xml
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index
6c5990d
..
bcb522b
100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-54,8
+54,9
@@
android:fullBackupOnly="true"
android:fullBackupContent="@xml/backupscheme"
android:hardwareAccelerated="true"
android:fullBackupOnly="true"
android:fullBackupContent="@xml/backupscheme"
android:hardwareAccelerated="true"
- android:icon="@
mipmap
/ic_launcher_home"
+ android:icon="@
drawable
/ic_launcher_home"
android:label="@string/derived_app_name"
android:label="@string/derived_app_name"
+ android:theme="@style/LauncherTheme"
android:largeHeap="@bool/config_largeHeap"
android:restoreAnyVersion="true"
android:supportsRtl="true" >
android:largeHeap="@bool/config_largeHeap"
android:restoreAnyVersion="true"
android:supportsRtl="true" >
@@
-69,10
+70,10
@@
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:stateNotNeeded="true"
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:stateNotNeeded="true"
- android:theme="@style/LauncherTheme"
- android:windowSoftInputMode="adjustPan"
+ android:windowSoftInputMode="adjustPan|stateUnchanged"
android:screenOrientation="nosensor"
android:configChanges="keyboard|keyboardHidden|navigation"
android:screenOrientation="nosensor"
android:configChanges="keyboard|keyboardHidden|navigation"
+ android:resizeableActivity="true"
android:resumeWhilePausing="true"
android:taskAffinity=""
android:enabled="true">
android:resumeWhilePausing="true"
android:taskAffinity=""
android:enabled="true">
@@
-90,6
+91,7
@@
<activity
android:name="com.android.launcher3.SettingsActivity"
android:label="@string/settings_button_text"
<activity
android:name="com.android.launcher3.SettingsActivity"
android:label="@string/settings_button_text"
+ android:theme="@android:style/Theme.DeviceDefault.Settings"
android:autoRemoveFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
android:autoRemoveFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
@@
-133,7
+135,7
@@
android:theme="@android:style/Theme.NoDisplay"
android:label="* HPROF"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.NoDisplay"
android:label="* HPROF"
android:excludeFromRecents="true"
- android:icon="@
mipmap
/ic_launcher_home"
+ android:icon="@
drawable
/ic_launcher_home"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@
-145,7
+147,7
@@
<activity
android:name="com.android.launcher3.testing.ToggleWeightWatcher"
android:label="Show Mem"
<activity
android:name="com.android.launcher3.testing.ToggleWeightWatcher"
android:label="Show Mem"
- android:icon="@
mipmap
/ic_launcher_home">
+ android:icon="@
drawable
/ic_launcher_home">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />