diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-21 20:35:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-21 20:35:29 +0000 |
commit | e04febbf8ec8326edb095d023e494911381cee66 (patch) | |
tree | 5ac674f93f7128f414c4537400c8ef898cbd40a3 /AndroidManifest.xml | |
parent | 3c9c7263dcd06cba449597104db039a4019e15ff (diff) | |
parent | 322d55622031985c75f7e5db07964b7730a97dac (diff) | |
download | android_packages_apps_Trebuchet-e04febbf8ec8326edb095d023e494911381cee66.tar.gz android_packages_apps_Trebuchet-e04febbf8ec8326edb095d023e494911381cee66.tar.bz2 android_packages_apps_Trebuchet-e04febbf8ec8326edb095d023e494911381cee66.zip |
Merge "Moving a few testing classes to a separate package" into ub-launcher3-master
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 103 |
1 files changed, 49 insertions, 54 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 901423475..1f908d6ec 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -90,39 +90,6 @@ </intent-filter> </activity> - <!-- ENABLE_FOR_TESTING - - <activity - android:name="com.android.launcher3.testing.LauncherExtension" - android:launchMode="singleTask" - android:clearTaskOnLaunch="true" - android:stateNotNeeded="true" - android:theme="@style/Theme" - android:windowSoftInputMode="adjustPan" - android:screenOrientation="nosensor" - android:enabled="false"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.HOME" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.MONKEY"/> - </intent-filter> - </activity> - - --> - - <activity - android:name="com.android.launcher3.ToggleWeightWatcher" - android:label="@string/toggle_weight_watcher" - android:enabled="@bool/debug_memory_enabled" - android:icon="@mipmap/ic_launcher_home"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity android:name="com.android.launcher3.WallpaperPickerActivity" android:theme="@style/Theme.WallpaperPicker" @@ -157,27 +124,6 @@ android:process=":settings_process"> </activity> - <!-- Debugging tools --> - <activity - android:name="com.android.launcher3.MemoryDumpActivity" - android:theme="@android:style/Theme.NoDisplay" - android:label="@string/debug_memory_activity" - android:enabled="@bool/debug_memory_enabled" - android:excludeFromRecents="true" - android:icon="@mipmap/ic_launcher_home" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - - <service android:name="com.android.launcher3.MemoryTracker" - android:enabled="@bool/debug_memory_enabled" - > - </service> - <!-- Intent received used to install shortcuts from other applications --> <receiver android:name="com.android.launcher3.InstallShortcutReceiver" @@ -204,5 +150,54 @@ <meta-data android:name="android.nfc.disable_beam_default" android:value="true" /> + + <!-- ENABLE_FOR_TESTING + + <activity + android:name="com.android.launcher3.testing.LauncherExtension" + android:launchMode="singleTask" + android:clearTaskOnLaunch="true" + android:stateNotNeeded="true" + android:theme="@style/Theme" + android:windowSoftInputMode="adjustPan" + android:screenOrientation="nosensor" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.HOME" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.MONKEY"/> + </intent-filter> + </activity> + + <activity + android:name="com.android.launcher3.testing.MemoryDumpActivity" + android:theme="@android:style/Theme.NoDisplay" + android:label="* HPROF" + android:excludeFromRecents="true" + android:icon="@mipmap/ic_launcher_home" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity + android:name="com.android.launcher3.testing.ToggleWeightWatcher" + android:label="Show Mem" + android:icon="@mipmap/ic_launcher_home"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <service android:name="com.android.launcher3.testing.MemoryTracker" /> + + --> + </application> </manifest> |