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?

Conflicts:
	res/values/preferences_defaults.xml
	res/xml/preferences_drawer.xml
	res/xml/preferences_homescreen.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Folder.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/PagedViewIcon.java
	src/com/android/launcher3/Workspace.java

Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327

1 files changed, 1 insertions, 2 deletions

diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java
index 6340d9d2e..cb038b2f2 100644
--- a/src/com/android/launcher3/TransitionEffectsFragment.java
+++ b/src/com/android/launcher3/TransitionEffectsFragment.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -27,7 +28,6 @@ public class TransitionEffectsFragment extends Fragment {
     ImageView mTransitionIcon;
     ListView mListView;
     View mCurrentSelection;
-    ScrollView mScrollView;
 
     String[] mTransitionStates;
     TypedArray mTransitionDrawables;
@@ -88,7 +88,6 @@ public class TransitionEffectsFragment extends Fragment {
 
         mTransitionIcon = (ImageView) v.findViewById(R.id.settings_transition_image);
         mListView = (ListView) v.findViewById(R.id.settings_transitions_list);
-        mScrollView = (ScrollView) v.findViewById(R.id.scroll_view);
         TextView title = (TextView) v.findViewById(R.id.transition_effect_title);
         title.setText(getResources().getString(R.string.scroll_effect_text));
         LinearLayout titleLayout = (LinearLayout) v.findViewById(R.id.transition_title);