summaryrefslogtreecommitdiffstats
path: root/res/layout/page_indicator_marker.xml
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-20 15:37:27 -0700
committerHyunyoung Song <hyunyoungs@google.com>2015-07-20 15:37:27 -0700
commit13ef17a37e683b8ad5800e9f542b411180fbec2f (patch)
tree96beaf07307486f6491f022da63ebe381765d1a8 /res/layout/page_indicator_marker.xml
parente5ec4ac409eb3d3169bb9350dfda51ae7e08291e (diff)
parente3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff)
downloadandroid_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.gz
android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.bz2
android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.zip
merged ub-launcher3-burnaby, and resolved conflicts
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild Note2: Verified that the git history of burnaby is (998 commit) is pulled into mnc-dev packages/apps/Launcher3 git project using gitk. b/22609402 Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
Diffstat (limited to 'res/layout/page_indicator_marker.xml')
-rw-r--r--res/layout/page_indicator_marker.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml
index 686d27569..564a95811 100644
--- a/res/layout/page_indicator_marker.xml
+++ b/res/layout/page_indicator_marker.xml
@@ -16,8 +16,8 @@
<com.android.launcher3.PageIndicatorMarker
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
- android:layout_width="16dp"
- android:layout_height="16dp"
+ android:layout_width="12dp"
+ android:layout_height="12dp"
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/inactive"