Merge "Various icon size changes" into ub-launcher3-burnaby (57ebefb5) · Commits · e / os / android_packages_apps_Trebuchet

res/layout/apps_customize_application.xml

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<com.android.launcher3.BubbleTextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/WorkspaceIcon.AppsCustomize"
		android:id="@+id/application_icon"
		android:focusable="true" />

res/layout/apps_grid_row_icon_view.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,5 +25,6 @@
		android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
		android:focusable="true"
		android:background="@drawable/focusable_view_bg"
		launcher:deferShadowGeneration="true" />
		launcher:deferShadowGeneration="true"
		launcher:iconDisplay="all_apps" />

res/layout/apps_list_row_view.xml

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="@dimen/apps_view_row_height"
		android:orientation="horizontal"
		android:focusable="true"
		android:background="@drawable/focusable_view_bg"
		android:descendantFocusability="afterDescendants">
		<TextView
		android:id="@+id/section"
		android:layout_width="64dp"
		android:layout_height="match_parent"
		android:paddingLeft="16dp"
		android:gravity="start\|center_vertical"
		android:textColor="@color/apps_view_section_text_color"
		android:textSize="@dimen/apps_view_section_text_size"
		android:focusable="false" />
		</LinearLayout>

res/values/attrs.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,10 @@
		<declare-styleable name="BubbleTextView">
		<attr name="layoutHorizontal" format="boolean" />
		<attr name="iconSizeOverride" format="dimension" />
		<attr name="iconPaddingOverride" format="dimension" />
		<attr name="textSizeOverride" format="dimension" />
		<attr name="iconDisplay" format="integer">
		<enum name="workspace" value="0" />
		<enum name="all_apps" value="1" />
		</attr>
		<attr name="deferShadowGeneration" format="boolean" />
		<attr name="customShadows" format="boolean" />
		</declare-styleable>

src/com/android/launcher3/BubbleTextView.java

+24 −29

Original line number	Diff line number	Diff line
		@@ -52,13 +52,14 @@ public class BubbleTextView extends TextView {
		private static final int SHADOW_SMALL_COLOUR = 0xCC000000;
		static final float PADDING_V = 3.0f;

		private static final int DISPLAY_WORKSPACE = 0;
		private static final int DISPLAY_ALL_APPS = 1;

		private Drawable mIcon;
		private final Drawable mBackground;
		private final CheckLongPressHelper mLongPressHelper;
		private final HolographicOutlineHelper mOutlineHelper;

		// TODO: Remove custom background handling code, as no instance of BubbleTextView use any
		// background.
		private boolean mBackgroundSizeChanged;

		private Bitmap mPressedBackground;
		@@ -69,8 +70,6 @@ public class BubbleTextView extends TextView {
		private final boolean mCustomShadowsEnabled;
		private final boolean mLayoutHorizontal;
		private final int mIconSize;
		private final int mIconPaddingSize;
		private final int mTextSize;
		private int mTextColor;

		private boolean mStayPressed;
		@@ -95,14 +94,21 @@ public class BubbleTextView extends TextView {
		R.styleable.BubbleTextView, defStyle, 0);
		mCustomShadowsEnabled = a.getBoolean(R.styleable.BubbleTextView_customShadows, true);
		mLayoutHorizontal = a.getBoolean(R.styleable.BubbleTextView_layoutHorizontal, false);
		mIconSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_iconSizeOverride,
		grid.allAppsIconSizePx);
		mIconPaddingSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_iconPaddingOverride,
		grid.iconDrawablePaddingPx);
		mTextSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_textSizeOverride,
		grid.allAppsIconTextSizePx);
		mDeferShadowGenerationOnTouch =
		a.getBoolean(R.styleable.BubbleTextView_deferShadowGeneration, false);

		int display = a.getInteger(R.styleable.BubbleTextView_iconDisplay, DISPLAY_WORKSPACE);
		int defaultIconSize = grid.iconSizePx;
		if (display == DISPLAY_WORKSPACE) {
		setTextSize(grid.iconTextSizePx);
		} else if (display == DISPLAY_ALL_APPS) {
		setTextSize(grid.allAppsIconTextSizePx);
		defaultIconSize = grid.allAppsIconSizePx;
		}

		mIconSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_iconSizeOverride,
		defaultIconSize);

		a.recycle();

		if (mCustomShadowsEnabled) {
		@@ -128,26 +134,18 @@ public class BubbleTextView extends TextView {
		setAccessibilityDelegate(LauncherAppState.getInstance().getAccessibilityDelegate());
		}

		public void onFinishInflate() {
		super.onFinishInflate();

		// Ensure we are using the right text size
		setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
		}

		public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache,
		boolean setDefaultPadding) {
		applyFromShortcutInfo(info, iconCache, setDefaultPadding, false);
		public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache) {
		applyFromShortcutInfo(info, iconCache, false);
		}

		public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache,
		boolean setDefaultPadding, boolean promiseStateChanged) {
		boolean promiseStateChanged) {
		Bitmap b = info.getIcon(iconCache);

		FastBitmapDrawable iconDrawable = Utilities.createIconDrawable(b);
		iconDrawable.setGhostModeEnabled(info.isDisabled != 0);

		setIcon(iconDrawable, mIconSize, setDefaultPadding ? mIconPaddingSize : -1);
		setIcon(iconDrawable, mIconSize);
		if (info.contentDescription != null) {
		setContentDescription(info.contentDescription);
		}
		@@ -160,7 +158,7 @@ public class BubbleTextView extends TextView {
		}

		public void applyFromApplicationInfo(AppInfo info) {
		setIcon(Utilities.createIconDrawable(info.iconBitmap), mIconSize, mIconPaddingSize);
		setIcon(Utilities.createIconDrawable(info.iconBitmap), mIconSize);
		setText(info.title);
		if (info.contentDescription != null) {
		setContentDescription(info.contentDescription);
		@@ -409,7 +407,7 @@ public class BubbleTextView extends TextView {
		preloadDrawable = (PreloadIconDrawable) mIcon;
		} else {
		preloadDrawable = new PreloadIconDrawable(mIcon, getPreloaderTheme());
		setIcon(preloadDrawable, mIconSize, -1);
		setIcon(preloadDrawable, mIconSize);
		}

		preloadDrawable.setLevel(progressLevel);
		@@ -437,7 +435,7 @@ public class BubbleTextView extends TextView {
		/**
		* Sets the icon for this view based on the layout direction.
		*/
		private Drawable setIcon(Drawable icon, int iconSize, int drawablePadding) {
		private Drawable setIcon(Drawable icon, int iconSize) {
		mIcon = icon;
		if (iconSize != -1) {
		mIcon.setBounds(0, 0, iconSize, iconSize);
		@@ -447,9 +445,6 @@ public class BubbleTextView extends TextView {
		} else {
		setCompoundDrawablesRelative(null, mIcon, null, null);
		}
		if (drawablePadding != -1) {
		setCompoundDrawablePadding(drawablePadding);
		}
		return icon;
		}

		@@ -463,7 +458,7 @@ public class BubbleTextView extends TextView {
		applyFromApplicationInfo((AppInfo) info);
		} else if (info instanceof ShortcutInfo) {
		applyFromShortcutInfo((ShortcutInfo) info,
		LauncherAppState.getInstance().getIconCache(), false);
		LauncherAppState.getInstance().getIconCache());
		}
		}
		}