diff options
| author | Timo Wendt <timo@tjwendt.de> | 2012-08-30 12:18:41 +0300 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-21 14:46:34 -0700 |
| commit | 7bf64fc72f7ad699524039440d6ee227d84b2a5e (patch) | |
| tree | a79d9c5af3a3d7d53143c731e45c9638d4899493 /packages/SettingsProvider | |
| parent | d68bad1c7da42ec39c8a6e487dfd8c63cec44270 (diff) | |
| download | frameworks_base-7bf64fc72f7ad699524039440d6ee227d84b2a5e.zip frameworks_base-7bf64fc72f7ad699524039440d6ee227d84b2a5e.tar.gz frameworks_base-7bf64fc72f7ad699524039440d6ee227d84b2a5e.tar.bz2 | |
Runtime toggle of navbar
This adds the framework support for enabling the Navigation bar
on devices with hardware keys. It is toggled from Settings, and
depends on device-specific support for the KeyDisabler hardware
control
Change-Id: I88fecb2ca1e8613591c327a93f53909b00239cd8
wm: Nullify hardkey function assignments if enabling the navbar
This caused erroneous (and sometimes duplicate) events being generated
due to the regular key function assignments. The navbar does its
own action management, so don't try to derive from the actions
usually present in hard keys.
Change-Id: I82866e24547f8145cac4f07820ae90aacce09281
Update DEV_FORCE_SHOW_NAVBAR constant.
Change-Id: Ie5b4317162c514d22276956f81007e064a3d0f32
Settings: Move DEV_FORCE_SHOW_NAVBAR load to loadSecureSettings.
Change-Id: I6ac53b8c9f7fce6f9ca6b4ad7bf31a1c1e896863
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 1cd2908..b3603c6 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -212,4 +212,7 @@ <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> <string name="def_nfc_payment_component"></string> + + <!-- Defaults for Settings.System.DEV_FORCE_SHOW_NAVBAR. --> + <integer name="def_force_disable_navkeys">0</integer> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 5a14967..72a3d8e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2471,6 +2471,9 @@ class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Secure.LONG_PRESS_TIMEOUT, R.integer.def_long_press_timeout_millis); + loadIntegerSetting(stmt, Settings.System.DEV_FORCE_SHOW_NAVBAR, + R.integer.def_force_disable_navkeys); + loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED, R.bool.def_touch_exploration_enabled); |