Commit Graph

37126 Commits

Author SHA1 Message Date
Fan Zhang
a9fd6ed8ed Keep candidates in radio button picker UI ordered
We will use the order from candidate list.

Change-Id: I3f5bfb9d603d6c926fddd4711e2899df10cb72ac
Fix: 37542504
Test: make RunSettingsRoboTests
2017-06-19 13:35:51 -07:00
Alison Cichowlas
1a74eefb54 Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79
2017-06-19 15:15:31 +00:00
Alison Cichowlas
eeda4ae540 Merge "Notification settings update." into oc-dr1-dev
am: cd9224a058

Change-Id: I22d96e1d02f9a5a19f0eae1db368ad71d9de9b7b
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  -s ours

Change-Id: Iac2feeee7ab758c9534522bf49b8aaa7f20620aa
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  -s ours

Change-Id: I09fcb2c2270b17a4de1e2f19b5c6f0cf37bd0758
2017-06-19 14:58:33 +00:00
Fan Zhang
411e99a793 Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7
am: 8d62516e89  -s ours

Change-Id: I64db01eb7d3d9f2fd6e951383b62f79032c7f9e4
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  -s ours

Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e
2017-06-19 14:53:02 +00:00
Fan Zhang
8d62516e89 Merge "Misc fixes for notification" into oc-dev
am: e3f322dfc7

Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
2017-06-19 14:47:34 +00:00
Fan Zhang
c15dd4ee9b Merge "Misc fixes for notification" into oc-dev
am: e3f322dfc7  -s ours

Change-Id: Ifef5d6fe32b61837fb03285cdc46744954b246ad
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
Bill Yi
06e6c5a446 Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours am: 3d6acb722c -s ours
am: f1d7a456ea  -s ours

Change-Id: If0f5b5f1fc2cc6e7ac6ab74e2ce0506cc009f5a2
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  -s ours

Change-Id: I94498408ff405b7f0093b0d1bf7beae718a4a2d5
2017-06-17 06:27:25 +00:00
Bill Yi
f1d7a456ea Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours
am: 3d6acb722c  -s ours

Change-Id: I6504b98738a17e027a7fb77dbdbdce4b8fa8fa6a
2017-06-17 06:25:30 +00:00
Bill Yi
07044295c8 Import translations. DO NOT MERGE am: 251cbcbcc5 -s ours
am: a09c96c1a5  -s ours

Change-Id: If4cd48f7385e36f9473e171824e7fe96c63ab338
2017-06-17 06:16:44 +00:00
Bill Yi
3d6acb722c Import translations. DO NOT MERGE
am: 251cbcbcc5  -s ours

Change-Id: Iac1be0f9462447d5935664f5f111a2d721237436
2017-06-17 06:14:17 +00:00
Bill Yi
a09c96c1a5 Import translations. DO NOT MERGE
am: 251cbcbcc5  -s ours

Change-Id: I068211d35ea2f411c996daa834d09c49db78b80a
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  -s ours

Change-Id: I80efbfae39a572306becec0f7839a49c1e3d9775
2017-06-17 06:09:13 +00:00
Bill Yi
92c2ff2307 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: fa8fa0d212  -s ours

Change-Id: I44db74c9ae9d6b236ee4f068dac9fdcfd190c3e0
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

Change-Id: Idec10ca420e5b7ae3f1a23cc24af67a110209483
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

Change-Id: I620fb411d5a69b71b321371e494d3db1b8e7b4cf
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

Change-Id: Ie9d8419b88c3bb97eca24e6037c8e46ab8fc8489
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

Change-Id: I8229328b2d1ab55c76cf939b55d8528f511dfcda
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

Change-Id: I08f5a9da6f6fac3206a5bb6df2e2106e91033863
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

Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
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

Change-Id: I980c6b356862e9d8af46e36e08f3d2cc07d5cf65
2017-06-16 21:12:21 +00:00
Lei Yu
25371b152c Merge "Update wakelock detector" into oc-dr1-dev
am: e2530c2f62

Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55
2017-06-16 20:52:09 +00: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
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
1bed022001 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5 am: 879fd4b406
am: d6db6d8938

Change-Id: I0d270d27a3f8b5050c9b14519bec16e2937ce12e
2017-06-16 19:13:22 +00:00
Shinji Sogo
d6db6d8938 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
am: 879fd4b406

Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
am: 27ca1272a5

Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5 Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am: cd1f7a3146

Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
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
bc723ba161 Merge "Display anomaly in battery usage page" into oc-dr1-dev am: b275471725
am: 1522839283

Change-Id: Ia234aa8a6e478ae7e5dac88867cef9297ff74ceb
2017-06-16 17:11:07 +00:00
Lei Yu
1522839283 Merge "Display anomaly in battery usage page" into oc-dr1-dev
am: b275471725

Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
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
0adb62176d Merge "Update Night display icon in Settings" into oc-dr1-dev am: ddd692cf1a
am: 3fb1655289

Change-Id: I10bf8db6918676588558c453f36b71c6f82872f2
2017-06-16 14:47:57 +00:00