diff options
author | Flamefire <alex@grundis.de> | 2014-04-02 20:02:43 +0200 |
---|---|---|
committer | Flamefire <alex@grundis.de> | 2014-04-22 19:40:44 +0200 |
commit | 45936b33b0e03b1f3111a0bfaa61344cd10b2cd1 (patch) | |
tree | 55d20ae5f55397e9e28275a4e987774d1b18c4f4 /src/com/android/launcher3/Folder.java | |
parent | 6a43e660cce2cda206f4fecf3ed4ecf9dce8f326 (diff) | |
download | android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.gz android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.bz2 android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.zip |
Add options to hide icon labels from drawer and homescreen
Forward port from CM 10.2
PS3: Fix typo
PS4: Rebase and global defaults
PS8: Rebase to head
Issue: There is already an Icon section in general, move both
settings there or leave separate in their categories?
Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 1a25760ae..1fcfa1173 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -31,9 +31,7 @@ import android.text.InputType; import android.text.Selection; import android.text.Spannable; import android.util.AttributeSet; -import android.util.DisplayMetrics; import android.util.Log; -import android.util.TypedValue; import android.view.ActionMode; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -43,8 +41,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.Interpolator; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; @@ -52,6 +48,7 @@ import android.widget.ScrollView; import android.widget.TextView; import com.android.launcher3.FolderInfo.FolderListener; +import com.android.launcher3.settings.SettingsProvider; import java.util.ArrayList; import java.util.Collections; @@ -195,6 +192,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); mAutoScrollHelper = new FolderAutoScrollHelper(mScrollView); + + if (SettingsProvider.getBoolean(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, + R.bool.preferences_interface_homescreen_hide_icon_labels)) { + mFolderName.setVisibility(View.GONE); + mFolderNameHeight = getPaddingBottom(); + } } private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() { @@ -270,7 +274,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)) { + mInfo.setTitle(newTitle); + } LauncherModel.updateItemInDatabase(mLauncher, mInfo); if (commit) { |