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
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
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
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
Maurice Lam
a57730aa57
Align fingerprint illustration size
...
Test: Manual
Bug: 62677095
Change-Id: I352bf5e20f4ce254d0777dfd544f4604f5c86dcb
2017-06-16 21:34:34 -07: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
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
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
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
Maurice Lam
846172564e
Make confirm lock screen use the right theme
...
Test: cd tests/robotests && mma
Bug: 62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
2017-06-16 13:02:36 -07:00
Shinji Sogo
d6db6d8938
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
...
am: 879fd4b406
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
...
am: 27ca1272a5
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
...
am: cd1f7a3146
2017-06-16 18:53:50 +00:00
Treehugger Robot
cd1f7a3146
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
2017-06-16 18:41:42 +00:00
Lei Yu
1522839283
Merge "Display anomaly in battery usage page" into oc-dr1-dev
...
am: b275471725
2017-06-16 17:06:37 +00:00
Lei Yu
b275471725
Merge "Display anomaly in battery usage page" into oc-dr1-dev
2017-06-16 16:55:53 +00:00
Christine Franks
3fb1655289
Merge "Update Night display icon in Settings" into oc-dr1-dev
...
am: ddd692cf1a
2017-06-16 14:43:56 +00:00
Christine Franks
ddd692cf1a
Merge "Update Night display icon in Settings" into oc-dr1-dev
2017-06-16 14:36:12 +00:00
Bill Yi
251cbcbcc5
Import translations. DO NOT MERGE
...
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
2017-06-16 07:12:33 -07:00
Bill Yi
76d55da74b
Import translations. DO NOT MERGE
...
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
2017-06-16 07:00:00 -07:00
Tony Mak
caac960e1a
Merge "Fix searching work app in settings" into oc-dr1-dev
...
am: e3d890eaae
2017-06-16 13:01:51 +00:00
TreeHugger Robot
e3d890eaae
Merge "Fix searching work app in settings" into oc-dr1-dev
2017-06-16 12:55:40 +00:00
Charles He
569a238509
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
...
am: add67648c7
2017-06-16 11:44:42 +00:00
Charles He
add67648c7
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
2017-06-16 11:36:07 +00:00
Android Build Merger (Role)
41a66cccc1
Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp
2017-06-16 10:59:26 +00:00
TreeHugger Robot
248cdec3e2
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
2017-06-16 10:59:23 +00:00
Tony Mak
ad168d2907
Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours
...
am: a59e02fd58
2017-06-16 10:59:11 +00:00
Tony Mak
c96bbcff90
Fix searching work app in settings
...
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a
2017-06-16 10:56:11 +00:00
Tony Mak
9f3f5f4fed
Fix searching work app in settings
...
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a
2017-06-16 10:55:49 +00:00
Tony Mak
a59e02fd58
Fix searching work app in settings NO PARTIAL RERUN
...
am: 5651e0f2ce
2017-06-16 10:55:11 +00:00
Tony Mak
5d25a0c796
Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce
...
am: 80cdf176e9
2017-06-16 10:55:11 +00:00
