Commit Graph

37633 Commits

Author SHA1 Message Date
Alison Cichowlas
2338ef6794 Merge "Notification settings update." into oc-dev am: e5493808fd -s ours
am: e79681c5b4  -s ours

Change-Id: I474100a5e3bfad5ad9e9f09b44a8bf0fdc0b4814
2017-06-19 17:59:58 +00:00
Doris Ling
e9060a3cb6 Delay showing the loading progress spinner in Managed App.
In warm load, the app list is populated much faster, and we should not
show the spinner if we can show the app list immediately.

Adding 100ms delay in showing the loading container. If the app list is
ready, show the list container directly without first showing the
loading container.

Change-Id: I8b3ea88d2382ece9226d5c7734fd1aa406160cf2
Fix: 36375109
Test: make RunSettingsRoboTests
2017-06-19 10:57:11 -07:00
Daniel Nishi
f2e4449f6f Merge "Add more sane multi-profile app attribution." into oc-dev
am: 4743423a82

Change-Id: Ia2c95906c0c526f426deaa243ff075ce70bee1fc
2017-06-19 17:55:30 +00:00
Daniel Nishi
2de5ab35f8 Merge "Add more sane multi-profile app attribution." into oc-dev
am: 4743423a82

Change-Id: I59630cf77da700cd5a159e11ac6f9818f1303199
2017-06-19 17:55:28 +00:00
Alison Cichowlas
f1ca862c5a Merge "Notification settings update." into oc-dev am: e5493808fd
am: 7cdc518674  -s ours

Change-Id: Ia4b989c4b3459d7ea1b76fa167f034844fc8159a
2017-06-19 17:54:47 +00:00
Alison Cichowlas
e79681c5b4 Merge "Notification settings update." into oc-dev
am: e5493808fd  -s ours

Change-Id: I43f0d112d2a5bbd57995e42d50f5877e905dfe20
2017-06-19 17:49:22 +00:00
Alison Cichowlas
7cdc518674 Merge "Notification settings update." into oc-dev
am: e5493808fd

Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a
2017-06-19 17:49:20 +00:00
Daniel Nishi
4743423a82 Merge "Add more sane multi-profile app attribution." into oc-dev 2017-06-19 17:45:31 +00:00
TreeHugger Robot
e5493808fd Merge "Notification settings update." into oc-dev 2017-06-19 17:34:41 +00:00
gaochong
aedbdd0df5 Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4 am: db233c6e88
am: dd3945eca5

Change-Id: Idb43358ecaa0ab0b04c59f255c75476857a5fb5d
2017-06-19 17:24:00 +00:00
Lei Yu
5350ec84c6 Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
am: d55579889a

Change-Id: I5c689e2f50f06c6501a771dd957e4408e888a092
2017-06-19 17:22:57 +00:00
gaochong
dd3945eca5 Merge "Fix Screen Magnification recursive draw" am: 4e7846fbe4
am: db233c6e88

Change-Id: If8a23a012e0b7a82dc0c6a7d349a15310b4eb43e
2017-06-19 17:12:41 +00:00
gaochong
db233c6e88 Merge "Fix Screen Magnification recursive draw"
am: 4e7846fbe4

Change-Id: I4890ba0d33dd9245f1393c59c77531f0597ff6ff
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
04f77b3a6f 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
Merged-In: Iac31575d894d7f3532c8e631ee9d77ee21830b29
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
2017-06-19 15:15:50 +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
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
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  -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
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
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

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
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

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
25371b152c Merge "Update wakelock detector" into oc-dr1-dev
am: e2530c2f62

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

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
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