From c7177f87e1e007ac722e9a7143781560fddd7608 Mon Sep 17 00:00:00 2001 From: Stevespear426 Date: Mon, 11 Feb 2013 23:02:34 +0100 Subject: Settings: Navigation bar Quick launch shortcuts (1 of 2) This allows up to 3 targets on the Navigation bar ring or Home buttons with custom Quick launch shortcut actions. Patchset 1 to 17 - Initial commits and edits Patchset 18 - Update preference layout - Use AOSP terminology for the feature name - Group under new 'Navigation bar' category - Rename Navigationbar buttons configurator Patchset 19 - Update commit message with x of y indicator Change-Id: I91a7b86b7bfa79526b537e28b510ec078a58c956 --- .../ic_navigation_ring_hint_activated.png | Bin 0 -> 1614 bytes .../ic_navigation_ring_hint_normal.png | Bin 0 -> 1614 bytes .../ic_navigation_ring_hint_activated.png | Bin 0 -> 1110 bytes .../ic_navigation_ring_hint_normal.png | Bin 0 -> 1110 bytes .../ic_navigation_ring_hint_activated.png | Bin 0 -> 2294 bytes .../ic_navigation_ring_hint_normal.png | Bin 0 -> 2294 bytes res/drawable/ic_navigation_ring_hint.xml | 37 +++++++++++++++ res/drawable/navbar_search_outerring.xml | 24 ++++++++++ res/layout-land/navigation_ring_targets.xml | 50 ++++++++++++++++++++ .../navigation_ring_targets.xml | 50 ++++++++++++++++++++ res/layout-sw600dp/navigation_ring_targets.xml | 51 +++++++++++++++++++++ res/layout/navigation_ring_targets.xml | 51 +++++++++++++++++++++ res/values-sw600dp/dimens.xml | 7 +++ res/values/dimens.xml | 9 ++++ res/values/strings.xml | 24 +++++++++- res/xml/system_settings.xml | 20 ++++++-- 16 files changed, 316 insertions(+), 7 deletions(-) create mode 100644 res/drawable-hdpi/ic_navigation_ring_hint_activated.png create mode 100644 res/drawable-hdpi/ic_navigation_ring_hint_normal.png create mode 100644 res/drawable-mdpi/ic_navigation_ring_hint_activated.png create mode 100644 res/drawable-mdpi/ic_navigation_ring_hint_normal.png create mode 100644 res/drawable-xhdpi/ic_navigation_ring_hint_activated.png create mode 100644 res/drawable-xhdpi/ic_navigation_ring_hint_normal.png create mode 100644 res/drawable/ic_navigation_ring_hint.xml create mode 100644 res/drawable/navbar_search_outerring.xml create mode 100644 res/layout-land/navigation_ring_targets.xml create mode 100644 res/layout-sw600dp-land/navigation_ring_targets.xml create mode 100644 res/layout-sw600dp/navigation_ring_targets.xml create mode 100644 res/layout/navigation_ring_targets.xml (limited to 'res') diff --git a/res/drawable-hdpi/ic_navigation_ring_hint_activated.png b/res/drawable-hdpi/ic_navigation_ring_hint_activated.png new file mode 100644 index 0000000..c8b5a2e Binary files /dev/null and b/res/drawable-hdpi/ic_navigation_ring_hint_activated.png differ diff --git a/res/drawable-hdpi/ic_navigation_ring_hint_normal.png b/res/drawable-hdpi/ic_navigation_ring_hint_normal.png new file mode 100644 index 0000000..c8b5a2e Binary files /dev/null and b/res/drawable-hdpi/ic_navigation_ring_hint_normal.png differ diff --git a/res/drawable-mdpi/ic_navigation_ring_hint_activated.png b/res/drawable-mdpi/ic_navigation_ring_hint_activated.png new file mode 100644 index 0000000..4b5b2a4 Binary files /dev/null and b/res/drawable-mdpi/ic_navigation_ring_hint_activated.png differ diff --git a/res/drawable-mdpi/ic_navigation_ring_hint_normal.png b/res/drawable-mdpi/ic_navigation_ring_hint_normal.png new file mode 100644 index 0000000..4b5b2a4 Binary files /dev/null and b/res/drawable-mdpi/ic_navigation_ring_hint_normal.png differ diff --git a/res/drawable-xhdpi/ic_navigation_ring_hint_activated.png b/res/drawable-xhdpi/ic_navigation_ring_hint_activated.png new file mode 100644 index 0000000..3aa890f Binary files /dev/null and b/res/drawable-xhdpi/ic_navigation_ring_hint_activated.png differ diff --git a/res/drawable-xhdpi/ic_navigation_ring_hint_normal.png b/res/drawable-xhdpi/ic_navigation_ring_hint_normal.png new file mode 100644 index 0000000..3aa890f Binary files /dev/null and b/res/drawable-xhdpi/ic_navigation_ring_hint_normal.png differ diff --git a/res/drawable/ic_navigation_ring_hint.xml b/res/drawable/ic_navigation_ring_hint.xml new file mode 100644 index 0000000..d962db5 --- /dev/null +++ b/res/drawable/ic_navigation_ring_hint.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/res/drawable/navbar_search_outerring.xml b/res/drawable/navbar_search_outerring.xml new file mode 100644 index 0000000..250e335 --- /dev/null +++ b/res/drawable/navbar_search_outerring.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/res/layout-land/navigation_ring_targets.xml b/res/layout-land/navigation_ring_targets.xml new file mode 100644 index 0000000..e72bd0a --- /dev/null +++ b/res/layout-land/navigation_ring_targets.xml @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/res/layout-sw600dp-land/navigation_ring_targets.xml b/res/layout-sw600dp-land/navigation_ring_targets.xml new file mode 100644 index 0000000..e72bd0a --- /dev/null +++ b/res/layout-sw600dp-land/navigation_ring_targets.xml @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/res/layout-sw600dp/navigation_ring_targets.xml b/res/layout-sw600dp/navigation_ring_targets.xml new file mode 100644 index 0000000..3fc6c6f --- /dev/null +++ b/res/layout-sw600dp/navigation_ring_targets.xml @@ -0,0 +1,51 @@ + + + + + + + + + + diff --git a/res/layout/navigation_ring_targets.xml b/res/layout/navigation_ring_targets.xml new file mode 100644 index 0000000..9fb0db8 --- /dev/null +++ b/res/layout/navigation_ring_targets.xml @@ -0,0 +1,51 @@ + + + + + + + + + + diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 1374efd..557fe27 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -38,4 +38,11 @@ 2dip 2dip 2 + + + 215dp + + 430dp + + 280dip diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2f0f859..a2dd145 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -72,5 +72,14 @@ 128dip + + 40dip + + 170dp + + 340dp + + 230dip + diff --git a/res/values/strings.xml b/res/values/strings.xml index 9972b13..877222b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4895,8 +4895,8 @@ Voice search In-app search - - Navigation bar + + Buttons and layout 1 - To begin editing, tap the lock icon\n\n2 - Tap any button to assign or change functionality\n\n3 - Long press any button to rearrange the order\n\n4 - To save, tap the lock icon again\n\n5 - To restore system default, tap the reset button\n\n • Actions can only be assigned to one button at a time\n\n• The home button cannot be re-assigned\n\n• Side buttons cannot be rearranged Quick tips @@ -5174,5 +5174,25 @@ Advanced reboot When unlocked, include options in the power menu for rebooting into recovery or bootloader + + Navigation bar + + + Quick launch shortcuts + Delete all user created navigation bar shortcuts and restore to default? + Navigation bar shortcuts reset to default + Navigation bar shortcuts saved + Open IME Switcher + Kill app + None + Take screenshot + Ring/Vibration + Ring/Silent + Ring/Vibration/Silent + Screen off + Toggle torch + Google Now + Choose action + diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml index f20f190..2009767 100644 --- a/res/xml/system_settings.xml +++ b/res/xml/system_settings.xml @@ -50,11 +50,6 @@ - - @@ -69,4 +64,19 @@ android:fragment="com.android.settings.cyanogenmod.HardwareKeys" android:title="@string/hardware_keys_title" /> + + + + + + + -- cgit v1.1