Julia Reynolds
c429ffb592
Merge "Migrate from setting to NotificationManager."
2017-06-19 17:59:03 +00:00
gaochong
be773e80e1
Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4 am: db233c6e88 am: dd3945eca5
...
am: aedbdd0df5
2017-06-19 17:48:52 +00:00
Lei Yu
c70c79aa5c
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev am: d55579889a
...
am: 5350ec84c6
2017-06-19 17:47:35 +00:00
gaochong
aedbdd0df5
Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4 am: db233c6e88
...
am: dd3945eca5
2017-06-19 17:24:00 +00:00
Lei Yu
5350ec84c6
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
...
am: d55579889a
2017-06-19 17:22:57 +00:00
gaochong
dd3945eca5
Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4
...
am: db233c6e88
2017-06-19 17:12:41 +00:00
gaochong
db233c6e88
Merge "Fix Screen Magnification recursive draw"
...
am: 4e7846fbe4
2017-06-19 17:07:37 +00:00
Lei Yu
d55579889a
Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
2017-06-19 17:03:29 +00:00
Treehugger Robot
4e7846fbe4
Merge "Fix Screen Magnification recursive draw"
2017-06-19 17:00:09 +00:00
Alison Cichowlas
1a74eefb54
Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
...
am: eeda4ae540
2017-06-19 15:15:31 +00:00
Alison Cichowlas
eeda4ae540
Merge "Notification settings update." into oc-dr1-dev
...
am: cd9224a058
2017-06-19 15:10:02 +00:00
Alison Cichowlas
cd9224a058
Merge "Notification settings update." into oc-dr1-dev
2017-06-19 15:02:17 +00:00
Fan Zhang
88a25b76d1
Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7 am: 8d62516e89 -s ours
...
am: 411e99a793
2017-06-19 14:59:03 +00:00
Fan Zhang
558ed199b2
Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7 -s ours am: c15dd4ee9b -s ours
...
am: 5b3bc0e1d8
2017-06-19 14:58:33 +00:00
Fan Zhang
411e99a793
Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7
...
am: 8d62516e89
2017-06-19 14:54:00 +00:00
Fan Zhang
5b3bc0e1d8
Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7 -s ours
...
am: c15dd4ee9b
2017-06-19 14:53:02 +00:00
Fan Zhang
8d62516e89
Merge "Misc fixes for notification" into oc-dev
...
am: e3f322dfc7
2017-06-19 14:47:34 +00:00
Fan Zhang
c15dd4ee9b
Merge "Misc fixes for notification" into oc-dev
...
am: e3f322dfc7
2017-06-19 14:47:33 +00:00
TreeHugger Robot
e3f322dfc7
Merge "Misc fixes for notification" into oc-dev
2017-06-19 14:39:21 +00:00
Alison Cichowlas
7b0a8b6815
Notification settings update.
...
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.
Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
2017-06-19 08:53:45 -04:00
gaochong
f4372d914e
Fix Screen Magnification recursive draw
...
When invoke the method View#setLayoutParams(), ViewRootImpl
will run method ViewRootImpl#performTraversals(). And
OnGlobalLayoutListener#onGlobalLayout() will be invoked.
When the method View#setLayoutParams() is invoked in
OnGlobalLayoutListener#onGlobalLayout(), there will be recursive
call. The view will be draw on and on. This situation happen in
Screen Magnification. It should remove the listener after
work completion.
Bug: https://issuetracker.google.com/issues/62613000
Test: use systrace when enter Screen Magnification,and view the
"traversal" times.
Change-Id: I01b1fcccb8b915ec436fb95f1d30c8ec0c0de0a9
Signed-off-by: gaochong <gaochong@xiaomi.com >
2017-06-19 17:26:18 +08:00
Bill Yi
06e6c5a446
Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours am: 3d6acb722c -s ours
...
am: f1d7a456ea
2017-06-17 06:27:54 +00:00
Bill Yi
50d3cfe714
Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours am: a09c96c1a5 -s ours
...
am: 07044295c8
2017-06-17 06:27:25 +00:00
Bill Yi
f1d7a456ea
Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours
...
am: 3d6acb722c
2017-06-17 06:25:30 +00:00
Bill Yi
07044295c8
Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours
...
am: a09c96c1a5
2017-06-17 06:16:44 +00:00
Bill Yi
3d6acb722c
Import translations. DO NOT MERGE
...
am: 251cbcbcc5
2017-06-17 06:14:17 +00:00
Bill Yi
a09c96c1a5
Import translations. DO NOT MERGE
...
am: 251cbcbcc5
2017-06-17 06:14:14 +00:00
Bill Yi
260be05dc7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fa8fa0d212 -s ours
...
am: 92c2ff2307
2017-06-17 06:09:13 +00:00
Bill Yi
92c2ff2307
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: fa8fa0d212
2017-06-17 06:07:14 +00:00
TreeHugger Robot
fa8fa0d212
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-17 06:00:21 +00:00
TreeHugger Robot
68b08e7b83
Merge "Import translations. DO NOT MERGE"
2017-06-17 05:57:37 +00:00
Fan Zhang
04e35f1d59
Merge "Hide app info button from app notification settings header" into oc-dr1-dev am: 9b4bb95e82
...
am: 49347cfb22
2017-06-17 02:15:16 +00:00
Maurice Lam
d2e63e791f
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev am: 2b836b0c0c
...
am: 3346d456f9
2017-06-17 02:14:44 +00:00
Fan Zhang
49347cfb22
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
...
am: 9b4bb95e82
2017-06-17 00:50:49 +00:00
TreeHugger Robot
9b4bb95e82
Merge "Hide app info button from app notification settings header" into oc-dr1-dev
2017-06-17 00:41:25 +00:00
Maurice Lam
3346d456f9
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
...
am: 2b836b0c0c
2017-06-17 00:20:54 +00:00
TreeHugger Robot
2b836b0c0c
Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev
2017-06-17 00:07:39 +00:00
TreeHugger Robot
8f8fb1c162
Merge "Add more space above the first item in choose usb mode dialog."
2017-06-16 23:35:24 +00:00
Maurice Lam
33cad22f4f
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev am: 98a9d341c8
...
am: 9b8f36e359
2017-06-16 22:42:26 +00:00
Fan Zhang
fdcb8b1dc8
Hide app info button from app notification settings header
...
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit 5d811c40d3
2017-06-16 22:30:31 +00:00
Fan Zhang
470e79a286
Misc fixes for notification
...
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header
Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix: 62138362
Fix: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 15:27:51 -07:00
TreeHugger Robot
d140cad1bc
Merge "Hide app info button from app notification settings header"
2017-06-16 22:26:09 +00:00
Maurice Lam
9b8f36e359
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
...
am: 98a9d341c8
2017-06-16 22:17:18 +00:00
TreeHugger Robot
98a9d341c8
Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
2017-06-16 22:08:06 +00:00
Lei Yu
69050d2bda
Merge "Update wakelock detector" into oc-dr1-dev am: e2530c2f62
...
am: 25371b152c
2017-06-16 21:12:21 +00:00
Lei Yu
25371b152c
Merge "Update wakelock detector" into oc-dr1-dev
...
am: e2530c2f62
2017-06-16 20:52:09 +00:00
jackqdyulei
837200041f
Move "Received files" in BluetoothSettings
...
Move it from menu to preference
Also clean up the code about menu since there is no menu anymore
in BluetoothSettings
Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
2017-06-16 13:45:46 -07:00
Lei Yu
e2530c2f62
Merge "Update wakelock detector" into oc-dr1-dev
2017-06-16 20:30:37 +00:00
Maurice Lam
f3c5b4d3eb
Make Accessibility settings a SUW suggestion
...
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug: 38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
2017-06-16 13:20:54 -07:00
Fan Zhang
5d811c40d3
Hide app info button from app notification settings header
...
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 13:12:44 -07:00
