Merge "Remove notification cap on lockscreen" into sc-v2-dev am: 26244a834c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15178426 Change-Id: I7539332261e18345aa937e21b1269a6d75b6d08b
This commit is contained in:
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright (C) 2014 The Android Open Source Project
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License
|
||||
-->
|
||||
<resources>
|
||||
<!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
|
||||
card. -->
|
||||
<integer name="keyguard_max_notification_count">3</integer>
|
||||
</resources>
|
||||
|
||||
@@ -28,9 +28,6 @@
|
||||
<!-- The number of columns that the top level tiles span in the QuickSettings -->
|
||||
<integer name="quick_settings_user_time_settings_tile_span">2</integer>
|
||||
|
||||
<!-- We have only space for one notification on phone landscape layouts. -->
|
||||
<integer name="keyguard_max_notification_count">1</integer>
|
||||
|
||||
<!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->
|
||||
<integer name="navigation_bar_deadzone_orientation">1</integer>
|
||||
|
||||
|
||||
@@ -22,8 +22,5 @@
|
||||
<resources>
|
||||
<integer name="status_bar_config_maxNotificationIcons">5</integer>
|
||||
|
||||
<!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
|
||||
card. -->
|
||||
<integer name="keyguard_max_notification_count">5</integer>
|
||||
</resources>
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
|
||||
<!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
|
||||
card. -->
|
||||
<integer name="keyguard_max_notification_count">3</integer>
|
||||
<integer name="keyguard_max_notification_count">-1</integer>
|
||||
|
||||
<!-- Defines the implementation of the velocity tracker to be used for the panel expansion. Can
|
||||
be 'platform' or 'noisy' (i.e. for noisy touch screens). -->
|
||||
|
||||
Reference in New Issue
Block a user