summaryrefslogtreecommitdiffstats
path: root/res/layout/page_indicator_marker.xml
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
committerHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
commit0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch)
treefe9ed94353b09dda232fceb64691f96dcd5db8d3 /res/layout/page_indicator_marker.xml
parentcf51139c6e1d57b57177109f2177edc41edf5bbc (diff)
parent13ef17a37e683b8ad5800e9f542b411180fbec2f (diff)
downloadandroid_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402 Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
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"