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 /res | |
| 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 'res')
| -rw-r--r-- | res/layout/zzz_dummy_widget.xml (renamed from res/layout/dummy_widget.xml) | 0 | ||||
| -rw-r--r-- | res/layout/zzz_weight_watcher.xml | 4 | ||||
| -rw-r--r-- | res/values/config.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
4 files changed, 4 insertions, 8 deletions
diff --git a/res/layout/dummy_widget.xml b/res/layout/zzz_dummy_widget.xml index a0fa8fc3e..a0fa8fc3e 100644 --- a/res/layout/dummy_widget.xml +++ b/res/layout/zzz_dummy_widget.xml diff --git a/res/layout/zzz_weight_watcher.xml b/res/layout/zzz_weight_watcher.xml new file mode 100644 index 000000000..07fd39e91 --- /dev/null +++ b/res/layout/zzz_weight_watcher.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.android.launcher3.testing.WeightWatcher xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/res/values/config.xml b/res/values/config.xml index 9f65569cf..af4c96d5a 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -66,9 +66,6 @@ <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">true</bool> - <!-- Memory debugging, including a memory dump icon --> - <bool name="debug_memory_enabled">false</bool> - <!-- Name of a subclass of com.android.launcher3.AppFilter used to filter the activities shown in the launcher. Can be empty. --> <string name="app_filter_class" translatable="false"></string> diff --git a/res/values/strings.xml b/res/values/strings.xml index fefadef28..7947fbd4a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,8 +45,6 @@ <!-- SafeMode widget error string --> <string name="safemode_widget_error">Widgets disabled in Safe mode</string> - <string name="toggle_weight_watcher">Show Mem</string> - <!-- Widgets --> <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] --> <string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string> @@ -158,9 +156,6 @@ <!-- Folder name format --> <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> - <!-- Debug-only activity name. [DO NOT TRANSLATE] --> - <string name="debug_memory_activity">* HPROF</string> - <!-- Strings for the customization mode --> <!-- Text for widget add button --> <string name="widget_button_text">Widgets</string> |