diff options
| author | Ji-Hwan Lee <jihwan@google.com> | 2014-04-22 14:14:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-22 14:14:21 +0000 |
| commit | ab47ff18c44c3e287ca1c8e302a7dbfad11e0aa5 (patch) | |
| tree | 283c611ea9e471b25e9aa955972658369e25393f /packages | |
| parent | cd8f0c58bb42e910a0a09cc37cbb15d308c96ce1 (diff) | |
| parent | 25eb3d0ce4709688683c07ad572fdfc03dc09232 (diff) | |
| download | frameworks_base-ab47ff18c44c3e287ca1c8e302a7dbfad11e0aa5.zip frameworks_base-ab47ff18c44c3e287ca1c8e302a7dbfad11e0aa5.tar.gz frameworks_base-ab47ff18c44c3e287ca1c8e302a7dbfad11e0aa5.tar.bz2 | |
Merge "Add config resource for disabling KeyguardService"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index d371d70..327df8d 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -273,7 +273,8 @@ <service android:name=".keyguard.KeyguardService" - android:exported="true" /> + android:exported="true" + android:enabled="@bool/config_enableKeyguardService" /> <activity android:name=".Somnambulator" android:label="@string/start_dreams" diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 85a9388..722ca15 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -72,7 +72,7 @@ <!-- decay duration (from size_max -> size), in ms --> <integer name="navigation_bar_deadzone_hold">333</integer> <integer name="navigation_bar_deadzone_decay">333</integer> - + <bool name="config_dead_zone_flash">false</bool> <!-- Min alpha % that recent items will fade to while being dismissed --> @@ -122,6 +122,9 @@ <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. --> <integer name="recents_max_task_stack_view_dim">96</integer> + <!-- Whether to enable KeyguardService or not --> + <bool name="config_enableKeyguardService">true</bool> + <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow card. --> <integer name="keyguard_max_notification_count">4</integer> |