Skip to content

Commit b8bb7a0

Browse files
adampAndroid (Google) Code Review
authored andcommitted
Merge "Port unmerged notification changes from jb-dev to jb-mr1-dev" into jb-mr1-dev
2 parents 5a829cb + 4377d14 commit b8bb7a0

File tree

4 files changed

+150
-104
lines changed

4 files changed

+150
-104
lines changed

packages/SystemUI/res/layout/status_bar_expanded.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
android:layout_width="match_parent"
7272
android:layout_height="wrap_content"
7373
android:fadingEdge="none"
74-
android:overScrollMode="always"
74+
android:overScrollMode="ifContentScrolls"
7575
>
7676
<com.android.systemui.statusbar.policy.NotificationRowLayout
7777
android:id="@+id/latestItems"

packages/SystemUI/res/values/config.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<!-- Vibration duration for MultiWaveView used in SearchPanelView -->
6767
<integer translatable="false" name="config_search_panel_view_vibration_duration">20</integer>
6868

69-
<!-- The length of the vibration when the notificaiotn pops open. -->
69+
<!-- The length of the vibration when the notification pops open. -->
7070
<integer name="one_finger_pop_duration_ms">10</integer>
7171

7272
<!-- Whether we're using the tablet-optimized recents interface (we use this
@@ -94,5 +94,8 @@
9494
<!-- Timeouts for brightness dialog to disappear -->
9595
<integer name="quick_settings_brightness_dialog_short_timeout">2000</integer>
9696
<integer name="quick_settings_brightness_dialog_long_timeout">4000</integer>
97+
98+
<integer name="blinds_pop_duration_ms">10</integer>
99+
97100
</resources>
98101

packages/SystemUI/res/values/dimens.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<!-- Height of the carrier/wifi name label -->
185185
<dimen name="carrier_label_height">24dp</dimen>
186186

187-
<!-- The distance you can pull a notificaiton before it pops open -->
187+
<!-- The distance you can pull a notification before it pops open -->
188188
<dimen name="one_finger_pop_limit">32dp</dimen>
189189

190190
<!-- The fixed height of each tile -->
@@ -196,4 +196,9 @@
196196
<!-- Minimum fraction of the screen that should be taken up by the notification panel.
197197
Not used at this screen size. -->
198198
<item type="dimen" name="notification_panel_min_height_frac">0%</item>
199+
200+
<dimen name="blinds_pop_threshold">32dp</dimen>
201+
202+
<!-- The size of the gesture span needed to activate the "pull" notification expansion -->
203+
<dimen name="pull_span_min">25dp</dimen>
199204
</resources>

0 commit comments

Comments
 (0)