diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-24 20:58:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-24 20:58:24 +0000 |
| commit | 2b5e56c23bc8123064eb24b4060daba0fc948300 (patch) | |
| tree | 6968df42de9aef7bf481d8d30a9741bdda47598b /res | |
| parent | 21f9f2a74795d88140794f3f64a26aed71ea1418 (diff) | |
| parent | e6eabffd39c85b4cdb022c5e803ed561d87bd88b (diff) | |
| download | android_packages_apps_Trebuchet-2b5e56c23bc8123064eb24b4060daba0fc948300.tar.gz android_packages_apps_Trebuchet-2b5e56c23bc8123064eb24b4060daba0fc948300.tar.bz2 android_packages_apps_Trebuchet-2b5e56c23bc8123064eb24b4060daba0fc948300.zip | |
Merge "Launcher changes to support custom cling hints." into jb-ub-now-indigo-rose
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/first_run_cling.xml | 24 | ||||
| -rw-r--r-- | res/layout-port/first_run_cling.xml | 11 | ||||
| -rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 28 insertions, 9 deletions
diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml index f82738096..3b21e14f6 100644 --- a/res/layout-land/first_run_cling.xml +++ b/res/layout-land/first_run_cling.xml @@ -34,9 +34,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_marginBottom="10dp" android:text="@string/first_run_cling_title" - android:textColor="#49C0EC" - android:textSize="32sp" /> + android:textColor="#FFFFFFFF" + android:textSize="30sp" /> <TextView style="@style/ClingAltTitleText" android:layout_width="wrap_content" @@ -47,22 +48,28 @@ </LinearLayout> <TextView style="@style/ClingHintText" + android:id="@+id/search_bar_hint" android:layout_width="160dp" android:layout_height="wrap_content" android:layout_gravity="top|end" android:layout_marginEnd="10dp" android:layout_marginTop="80dp" - android:text="@string/first_run_cling_search_bar_hint" - android:visibility="gone" /> + android:visibility="gone" + android:drawableTop="@drawable/cling_arrow_up" + android:drawablePadding="5dp" + android:text="@string/first_run_cling_search_bar_hint" /> <TextView style="@style/ClingHintText" + android:id="@+id/custom_content_hint" android:layout_width="160dp" android:layout_height="wrap_content" android:layout_gravity="top" android:layout_marginStart="10dp" android:layout_marginTop="100dp" - android:text="@string/first_run_cling_custom_content_hint" - android:visibility="gone" /> + android:visibility="gone" + android:drawableStart="@drawable/cling_arrow_left" + android:drawablePadding="10dp" + android:text="@string/first_run_cling_custom_content_hint" /> <TextView style="@style/ClingHintText" android:layout_width="160dp" @@ -70,8 +77,9 @@ android:layout_gravity="bottom|end" android:layout_marginEnd="10dp" android:layout_marginBottom="100dp" - android:text="@string/first_run_cling_create_screens_hint" - android:visibility="gone" /> + android:drawableEnd="@drawable/cling_arrow_right" + android:drawablePadding="5dp" + android:text="@string/first_run_cling_create_screens_hint" /> </FrameLayout> <Button style="@style/ClingButton" diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml index cdc49b9cb..3b21e14f6 100644 --- a/res/layout-port/first_run_cling.xml +++ b/res/layout-port/first_run_cling.xml @@ -36,7 +36,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="10dp" android:text="@string/first_run_cling_title" - android:textColor="#49C0EC" + android:textColor="#FFFFFFFF" android:textSize="30sp" /> <TextView style="@style/ClingAltTitleText" @@ -48,19 +48,27 @@ </LinearLayout> <TextView style="@style/ClingHintText" + android:id="@+id/search_bar_hint" android:layout_width="160dp" android:layout_height="wrap_content" android:layout_gravity="top|end" android:layout_marginEnd="10dp" android:layout_marginTop="80dp" + android:visibility="gone" + android:drawableTop="@drawable/cling_arrow_up" + android:drawablePadding="5dp" android:text="@string/first_run_cling_search_bar_hint" /> <TextView style="@style/ClingHintText" + android:id="@+id/custom_content_hint" android:layout_width="160dp" android:layout_height="wrap_content" android:layout_gravity="top" android:layout_marginStart="10dp" android:layout_marginTop="100dp" + android:visibility="gone" + android:drawableStart="@drawable/cling_arrow_left" + android:drawablePadding="10dp" android:text="@string/first_run_cling_custom_content_hint" /> <TextView style="@style/ClingHintText" @@ -70,6 +78,7 @@ android:layout_marginEnd="10dp" android:layout_marginBottom="100dp" android:drawableEnd="@drawable/cling_arrow_right" + android:drawablePadding="5dp" android:text="@string/first_run_cling_create_screens_hint" /> </FrameLayout> <Button diff --git a/res/values/colors.xml b/res/values/colors.xml index 48a06fc7d..43a856d9f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -35,4 +35,6 @@ <color name="wallpaper_picker_translucent_gray">#66000000</color> <color name="folder_items_text_color">#FF333333</color> <color name="outline_color">#FFFFFFFF</color> + + <color name="first_run_cling_circle_background_color">#FF83AEE8</color> </resources> |