Commit d5ef546
John Spurlock
NavBar: Slippery on the unsecured lock screen.
The NavBar is always non-slippery, except when:
- the notification shade is showing
- the 3 buttons (back,home,recents) are disabled
Also fix unrelated bug that ignored the "show panel delay"
before the first config change.
Bug: 6614842
Change-Id: Ib40adaef122b563809398fdebbd8a88d8f0c7ffd1 parent c07dc74 commit d5ef546
File tree
2 files changed
+29
-18
lines changed- packages/SystemUI/src/com/android/systemui/statusbar/phone
2 files changed
+29
-18
lines changedLines changed: 17 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
| 228 | + | |
| 229 | + | |
228 | 230 | | |
229 | 231 | | |
230 | 232 | | |
231 | 233 | | |
232 | 234 | | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
233 | 250 | | |
234 | 251 | | |
235 | 252 | | |
| |||
Lines changed: 12 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
376 | 376 | | |
377 | 377 | | |
378 | 378 | | |
| 379 | + | |
| 380 | + | |
379 | 381 | | |
380 | 382 | | |
381 | 383 | | |
| |||
663 | 665 | | |
664 | 666 | | |
665 | 667 | | |
666 | | - | |
667 | 668 | | |
668 | 669 | | |
669 | 670 | | |
| |||
808 | 809 | | |
809 | 810 | | |
810 | 811 | | |
811 | | - | |
812 | | - | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
813 | 818 | | |
814 | 819 | | |
815 | 820 | | |
| |||
1174 | 1179 | | |
1175 | 1180 | | |
1176 | 1181 | | |
1177 | | - | |
| 1182 | + | |
| 1183 | + | |
1178 | 1184 | | |
1179 | 1185 | | |
1180 | 1186 | | |
| |||
1198 | 1204 | | |
1199 | 1205 | | |
1200 | 1206 | | |
1201 | | - | |
1202 | | - | |
1203 | | - | |
1204 | | - | |
1205 | | - | |
1206 | | - | |
1207 | | - | |
1208 | | - | |
1209 | | - | |
1210 | | - | |
1211 | | - | |
1212 | | - | |
1213 | | - | |
1214 | 1207 | | |
1215 | 1208 | | |
1216 | 1209 | | |
| |||
1295 | 1288 | | |
1296 | 1289 | | |
1297 | 1290 | | |
| 1291 | + | |
| 1292 | + | |
1298 | 1293 | | |
1299 | | - | |
1300 | 1294 | | |
1301 | 1295 | | |
1302 | 1296 | | |
| |||
0 commit comments