diff options
| author | LuK1337 <priv.luk@gmail.com> | 2015-11-24 18:07:46 +0100 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2015-11-24 18:14:09 +0100 |
| commit | e396f83869f6982e52c17c83c57864a09398fb80 (patch) | |
| tree | 0d499beaad4f1810a04f95eacd88f569adcb4caa /res | |
| parent | 7e1c23414e3c839ce30e0f855a98d8f0d94f39c5 (diff) | |
| download | packages_apps_Settings-e396f83869f6982e52c17c83c57864a09398fb80.zip packages_apps_Settings-e396f83869f6982e52c17c83c57864a09398fb80.tar.gz packages_apps_Settings-e396f83869f6982e52c17c83c57864a09398fb80.tar.bz2 | |
Revert "Settings : Nav ring"
* M no longer has nav ring
This reverts commit 9cf9098e3f3a6d71ec600b862005452068db86b8.
Change-Id: I1484c3b2b9d3656a9f928977ee2eeaec37170bbc
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/nav_bar.xml | 3 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/button_settings.xml | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/res/layout/nav_bar.xml b/res/layout/nav_bar.xml index 8ddf05c..5130c93 100644 --- a/res/layout/nav_bar.xml +++ b/res/layout/nav_bar.xml @@ -6,7 +6,6 @@ android:padding="25dp" android:orientation="vertical"> <TextView - android:id="@+id/message" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dip" @@ -83,4 +82,4 @@ android:textSize="14sp" /> </LinearLayout> </LinearLayout> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 6c076c8..2050c63 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -447,9 +447,6 @@ <string name="disable_navkeys_title">Enable on-screen nav bar</string> <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string> - <string name="navigation_ring_title">Navigation ring targets</string> - <string name="navigation_ring_message">Tap the edit icon to open the navigation ring for editing.\n\nSelect a target to configure its behavior.\n\nTap the check mark icon to save your changes, or restore to reset the settings to defaults.</string> - <!--- Advanced Settings --> <string name="advanced_settings">Advanced settings</string> <string name="advanced_settings_summary">Enable more settings options</string> diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml index 93dde2b..d62b538 100644 --- a/res/xml/button_settings.xml +++ b/res/xml/button_settings.xml @@ -59,11 +59,6 @@ android:fragment="com.android.settings.cyanogenmod.NavBar" android:title="@string/navigation_bar_title" /> - <PreferenceScreen - android:key="navigation_bar_ring" - android:fragment="com.android.settings.cyanogenmod.NavRing" - android:title="@string/navigation_ring_title" /> - <ListPreference android:key="navigation_recents_long_press" android:dialogTitle="@string/navigation_bar_recents_title" |