summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHayden Schoen <hayden@cyngn.com>2015-04-27 14:07:12 -0700
committerRajesh Yengisetty <rajesh@cyngn.com>2015-05-06 22:34:38 +0000
commit87823f4db0b5b1d52e6ce77f0a7797b565919774 (patch)
tree65689e0c2dfe3cf7e15c76ce98842ba5d77bb257
parente93ad32212d7059afa3afbb6dbc16486ed6fd806 (diff)
downloadandroid_packages_apps_Trebuchet-87823f4db0b5b1d52e6ce77f0a7797b565919774.tar.gz
android_packages_apps_Trebuchet-87823f4db0b5b1d52e6ce77f0a7797b565919774.tar.bz2
android_packages_apps_Trebuchet-87823f4db0b5b1d52e6ce77f0a7797b565919774.zip
Trebuchet: Adjusted margin and vertical alignment of row title
Change-Id: Ic3e0837ac2726e4437bc5df68a3b1cb033d2d78f (cherry picked from commit eaec663a1e540a6458f493f67334e9213419ed69)
-rw-r--r--res/layout/app_drawer_item.xml10
-rw-r--r--src/com/android/launcher3/AppDrawerListAdapter.java2
2 files changed, 7 insertions, 5 deletions
diff --git a/res/layout/app_drawer_item.xml b/res/layout/app_drawer_item.xml
index b80ad6756..d89569640 100644
--- a/res/layout/app_drawer_item.xml
+++ b/res/layout/app_drawer_item.xml
@@ -32,7 +32,6 @@
<LinearLayout
android:id="@+id/drawer_item_flow"
android:layout_alignParentRight="true"
- android:paddingTop="10dp"
android:layout_toRightOf="@+id/drawer_item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,11 +49,14 @@
<com.android.launcher3.AutoFitTextView
android:id="@+id/drawer_item_title"
android:layout_width="@dimen/app_drawer_char_width"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
+ android:layout_height="fill_parent"
+ android:layout_marginTop="6dp"
+ android:layout_marginBottom="24dp"
android:layout_marginLeft="6dp"
+ android:layout_alignTop="@id/drawer_item_flow"
+ android:layout_alignBottom="@id/drawer_item_flow"
android:layout_centerVertical="true"
- android:includeFontPadding="true"
+ android:includeFontPadding="false"
android:gravity="center"
android:singleLine="true"
autofit:minTextSize="8sp"
diff --git a/src/com/android/launcher3/AppDrawerListAdapter.java b/src/com/android/launcher3/AppDrawerListAdapter.java
index 20beb0664..81c489e45 100644
--- a/src/com/android/launcher3/AppDrawerListAdapter.java
+++ b/src/com/android/launcher3/AppDrawerListAdapter.java
@@ -636,7 +636,7 @@ public class AppDrawerListAdapter extends RecyclerView.Adapter<AppDrawerListAdap
if (params instanceof ViewGroup.MarginLayoutParams) {
ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) params;
marginParams.setMargins(marginParams.leftMargin, marginParams.topMargin,
- marginParams.rightMargin, mDeviceProfile.iconTextSizePx);
+ marginParams.rightMargin, marginParams.bottomMargin);
holder.mTextView.setLayoutParams(marginParams);
}