diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/launcher.xml | 16 | ||||
| -rw-r--r-- | res/layout/apps_customize_pane.xml | 6 | ||||
| -rw-r--r-- | res/layout/scroll_indicator.xml | 1 | ||||
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 7 |
6 files changed, 40 insertions, 8 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index bee7716..cbf5305 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -45,13 +45,27 @@ android:layout_marginBottom="@dimen/button_bar_height" android:layout_gravity="bottom" /> <include - android:id="@+id/paged_view_indicator_horizontal" + android:id="@+id/paged_view_indicator_dock" layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginBottom="@dimen/button_bar_height" /> + <include + android:id="@+id/paged_view_indicator_top" + layout="@layout/scroll_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" /> + + <include + android:id="@+id/paged_view_indicator_bottom" + layout="@layout/scroll_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" /> + <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 2753408..fd61fe0 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -82,16 +82,14 @@ layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:visibility="gone" /> + android:layout_gravity="bottom" /> <include android:id="@+id/paged_view_indicator_vertical" layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:visibility="gone" /> + android:layout_gravity="right" /> </FrameLayout> </LinearLayout> diff --git a/res/layout/scroll_indicator.xml b/res/layout/scroll_indicator.xml index 4ea312b..9ce3035 100644 --- a/res/layout/scroll_indicator.xml +++ b/res/layout/scroll_indicator.xml @@ -15,6 +15,7 @@ --> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/paged_view_indicator" android:visibility="gone" android:alpha="0" android:scaleType="fitXY" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 481f69d..ccc5dd4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -18,6 +18,16 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="preferences_interface_homescreen_indicator_position_entries"> + <item>Above Dock</item> + <item>Top</item> + <item>Bottom</item> + </string-array> + <string-array name="preferences_interface_homescreen_indicator_position_values"> + <item>0</item> + <item>1</item> + <item>2</item> + </string-array> <string-array name="preferences_interface_homescreen_scrolling_transition_effect_entries"> <item>Standard</item> <item>Tablet</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 5d468b7..b50b7af 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -334,9 +334,11 @@ s --> <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Show screen outlines when scrolling homescreens</string> <string name="preferences_interface_homescreen_indicator_category">Indicator</string> <string name="preferences_interface_homescreen_indicator_enable_title">Show page indicator</string> - <string name="preferences_interface_homescreen_indicator_enable_summary">Show current page indicator at the bottom of the screen</string> + <string name="preferences_interface_homescreen_indicator_enable_summary">Show current page indicator on the screen</string> <string name="preferences_interface_homescreen_indicator_fade_title">Fade indicator</string> - <string name="preferences_interface_homescreen_indicator_fade_summary">Fade the indicator after the homescreen has changed</string> + <string name="preferences_interface_homescreen_indicator_fade_summary">Fade away the indicator after the homescreen has changed</string> + <string name="preferences_interface_homescreen_indicator_position_title">Indicator position</string> + <string name="preferences_interface_homescreen_indicator_position_summary">Choose where to show the indicator on the screen</string> <string name="preferences_interface_homescreen_indicator_background_title">Show dock divider</string> <string name="preferences_interface_homescreen_indicator_background_summary">Show the background behind the indicator</string> @@ -356,7 +358,7 @@ s --> <string name="preferences_interface_drawer_indicator_enable_title">Show page indicator</string> <string name="preferences_interface_drawer_indicator_enable_summary">Show current page indicator at the bottom of the screen</string> <string name="preferences_interface_drawer_indicator_fade_title">Fade indicator</string> - <string name="preferences_interface_drawer_indicator_fade_summary">Fade the indicator after the page has changed</string> + <string name="preferences_interface_drawer_indicator_fade_summary">Fade away the indicator after the page has changed</string> <!-- Dock --> <string name="preferences_interface_dock_title">Dock</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 9242b01..4134402 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -94,6 +94,13 @@ android:summary="@string/preferences_interface_homescreen_indicator_fade_summary" android:defaultValue="true" android:dependency="ui_homescreen_indicator_enable" /> + <ListPreference android:key="ui_homescreen_indicator_position" + android:title="@string/preferences_interface_homescreen_indicator_position_title" + android:summary="@string/preferences_interface_homescreen_indicator_position_summary" + android:entries="@array/preferences_interface_homescreen_indicator_position_entries" + android:entryValues="@array/preferences_interface_homescreen_indicator_position_values" + android:defaultValue="0" + android:dependency="ui_homescreen_indicator_enable" /> <CheckBoxPreference android:key="ui_homescreen_indicator_background" android:title="@string/preferences_interface_homescreen_indicator_background_title" android:summary="@string/preferences_interface_homescreen_indicator_background_summary" |