diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-09-09 22:26:43 -0700 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-09-11 00:09:55 +0000 |
commit | 97fcaba272915d3c9399337363c16433d0fe4b3a (patch) | |
tree | d01f33b333ab4c58138a1adc083a38d6645f9572 /res | |
parent | 41af711d1355ae8c08aff9a2e367c7a0893fd110 (diff) | |
download | android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.tar.gz android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.tar.bz2 android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.zip |
Re-add Fade side pages and Page outline options.
Change-Id: Iaab1dbd980d065e631d8f3cfe363f3a0b5897f86
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/action_navigation_previous_light.png | bin | 0 -> 627 bytes | |||
-rw-r--r-- | res/drawable-hdpi/overflow_options_menu.png | bin | 0 -> 342 bytes | |||
-rw-r--r-- | res/drawable-mdpi/action_navigation_previous_light.png | bin | 0 -> 409 bytes | |||
-rw-r--r-- | res/drawable-mdpi/overflow_options_menu.png | bin | 0 -> 216 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/action_navigation_previous_light.png | bin | 0 -> 810 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/overflow_options_menu.png | bin | 0 -> 355 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/action_navigation_previous_light.png | bin | 0 -> 1327 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/overflow_options_menu.png | bin | 0 -> 617 bytes | |||
-rw-r--r-- | res/drawable/handle_left.png | bin | 370 -> 0 bytes | |||
-rw-r--r-- | res/layout/dynamic_grid_size_screen.xml | 4 | ||||
-rw-r--r-- | res/layout/settings_transitions_screen.xml | 66 |
11 files changed, 46 insertions, 24 deletions
diff --git a/res/drawable-hdpi/action_navigation_previous_light.png b/res/drawable-hdpi/action_navigation_previous_light.png Binary files differnew file mode 100644 index 000000000..874466f73 --- /dev/null +++ b/res/drawable-hdpi/action_navigation_previous_light.png diff --git a/res/drawable-hdpi/overflow_options_menu.png b/res/drawable-hdpi/overflow_options_menu.png Binary files differnew file mode 100644 index 000000000..a074c10d0 --- /dev/null +++ b/res/drawable-hdpi/overflow_options_menu.png diff --git a/res/drawable-mdpi/action_navigation_previous_light.png b/res/drawable-mdpi/action_navigation_previous_light.png Binary files differnew file mode 100644 index 000000000..f50c8f2b5 --- /dev/null +++ b/res/drawable-mdpi/action_navigation_previous_light.png diff --git a/res/drawable-mdpi/overflow_options_menu.png b/res/drawable-mdpi/overflow_options_menu.png Binary files differnew file mode 100644 index 000000000..b6d614fca --- /dev/null +++ b/res/drawable-mdpi/overflow_options_menu.png diff --git a/res/drawable-xhdpi/action_navigation_previous_light.png b/res/drawable-xhdpi/action_navigation_previous_light.png Binary files differnew file mode 100644 index 000000000..22bd16362 --- /dev/null +++ b/res/drawable-xhdpi/action_navigation_previous_light.png diff --git a/res/drawable-xhdpi/overflow_options_menu.png b/res/drawable-xhdpi/overflow_options_menu.png Binary files differnew file mode 100644 index 000000000..7be3c2a4f --- /dev/null +++ b/res/drawable-xhdpi/overflow_options_menu.png diff --git a/res/drawable-xxhdpi/action_navigation_previous_light.png b/res/drawable-xxhdpi/action_navigation_previous_light.png Binary files differnew file mode 100644 index 000000000..ca3d00c4e --- /dev/null +++ b/res/drawable-xxhdpi/action_navigation_previous_light.png diff --git a/res/drawable-xxhdpi/overflow_options_menu.png b/res/drawable-xxhdpi/overflow_options_menu.png Binary files differnew file mode 100644 index 000000000..a0cb8a418 --- /dev/null +++ b/res/drawable-xxhdpi/overflow_options_menu.png diff --git a/res/drawable/handle_left.png b/res/drawable/handle_left.png Binary files differdeleted file mode 100644 index b78889ec0..000000000 --- a/res/drawable/handle_left.png +++ /dev/null diff --git a/res/layout/dynamic_grid_size_screen.xml b/res/layout/dynamic_grid_size_screen.xml index 5109e73d8..f7cafaff0 100644 --- a/res/layout/dynamic_grid_size_screen.xml +++ b/res/layout/dynamic_grid_size_screen.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:adjustViewBounds="true" - android:src="@drawable/handle_left" /> + android:src="@drawable/action_navigation_previous_light" /> <TextView android:layout_width="wrap_content" @@ -29,7 +29,7 @@ android:text="@string/grid_size_text" android:textAllCaps="true" android:fontFamily="sans-serif-condensed" - android:textColor="@android:color/white" + android:textColor="@color/listitem_text" android:layout_gravity="center_vertical" android:textSize="16sp" /> </LinearLayout> diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml index 8457841a5..dd47636e2 100644 --- a/res/layout/settings_transitions_screen.xml +++ b/res/layout/settings_transitions_screen.xml @@ -7,32 +7,54 @@ android:paddingTop="@dimen/overview_panel_bottom_padding" android:clickable="true" > - <LinearLayout - android:id="@+id/transition_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:background="@drawable/listitem_bg" - android:clickable="true" > + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> - <ImageView - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/transition_title" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:adjustViewBounds="true" - android:src="@drawable/handle_left" /> + android:orientation="horizontal" + android:background="@drawable/listitem_bg" + android:layout_alignParentLeft="true" + android:clickable="true" > - <TextView - android:id="@+id/transition_effect_title" + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:adjustViewBounds="true" + android:src="@drawable/action_navigation_previous_light" /> + + <TextView + android:id="@+id/transition_effect_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/scroll_effect_text" + android:textAllCaps="true" + android:textColor="@color/listitem_text" + android:layout_gravity="center_vertical" + android:textSize="16sp" /> + </LinearLayout> + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/scroll_effect_text" - android:textAllCaps="true" - android:fontFamily="sans-serif-condensed" - android:textColor="@android:color/white" - android:layout_gravity="center_vertical" - android:textSize="16sp" /> - </LinearLayout> + android:orientation="horizontal" + android:layout_alignParentRight="true" + android:background="@drawable/listitem_bg" + android:clickable="true" > + + <ImageView + android:id="@+id/transition_options_menu" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:adjustViewBounds="true" + android:src="@drawable/overflow_options_menu" /> + </LinearLayout> + </RelativeLayout> <ImageView android:id="@+id/settings_transition_image" @@ -48,4 +70,4 @@ android:layout_height="wrap_content" android:listSelector="@android:color/transparent" android:splitMotionEvents="false"/> -</LinearLayout> +</LinearLayout>
\ No newline at end of file |