summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Folder.java
diff options
context:
space:
mode:
authorYvonne Wong <ywong@cyngn.com>2015-11-20 10:49:59 -0800
committerYvonne Wong <ywong@cyngn.com>2015-11-30 11:50:09 -0800
commitb3de38c976eeb5a8c4b5c1b0d68d9c84253d3187 (patch)
treefd5ebd4fecaa73e607d422575a34c474e594c20b /src/com/android/launcher3/Folder.java
parent9a147bf42d2e3b3fb565e4264efe00eb293454b8 (diff)
downloadandroid_packages_apps_Trebuchet-b3de38c976eeb5a8c4b5c1b0d68d9c84253d3187.tar.gz
android_packages_apps_Trebuchet-b3de38c976eeb5a8c4b5c1b0d68d9c84253d3187.tar.bz2
android_packages_apps_Trebuchet-b3de38c976eeb5a8c4b5c1b0d68d9c84253d3187.zip
Reimplement CM Settings Overview Panel in the new Launcher Part 1
- Adds vertical sliding panel and animations associated with opening and closing the panel - Adds the views for settings and animation for the drawer arrow - Enables hiding workspace icon labels, hiding drawer icon labels, scrolling wallpaper, and larger icons - Changes how ragged grid custom icon sizes gets defined Change-Id: I1a82215a09486b4770494e665e598efdbabd1d3e
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r--src/com/android/launcher3/Folder.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 994d7d30d..1e0827e54 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -63,6 +63,7 @@ import com.android.launcher3.FolderInfo.FolderListener;
import com.android.launcher3.UninstallDropTarget.UninstallSource;
import com.android.launcher3.Workspace.ItemOperator;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource;
+import com.android.launcher3.settings.SettingsProvider;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.UiThreadCircularReveal;
@@ -229,6 +230,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
mFolderName.setInputType(mFolderName.getInputType() |
InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+ boolean hideLabels = SettingsProvider.getBoolean(mLauncher,
+ SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
+ R.bool.preferences_interface_homescreen_hide_icon_labels_default);
+ if (hideLabels) {
+ mFolderName.setVisibility(View.GONE);
+ }
+
mFooter = findViewById(R.id.folder_footer);
// We find out how tall footer wants to be (it is set to wrap_content), so that
@@ -326,7 +334,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// Convert to a string here to ensure that no other state associated with the text field
// gets saved.
String newTitle = mFolderName.getText().toString();
- mInfo.setTitle(newTitle);
+ if (!SettingsProvider.getBoolean(mLauncher,
+ SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
+ R.bool.preferences_interface_homescreen_hide_icon_labels_default)) {
+ mInfo.setTitle(newTitle);
+ }
LauncherModel.updateItemInDatabase(mLauncher, mInfo);
if (commit) {