Maurice Lam
82b92cadd5
Merge "Support find sensor screen with no animation"
2017-05-27 02:46:06 +00:00
TreeHugger Robot
f6b63db187
Merge "Add # of active print jobs back to print setting summary"
2017-05-27 01:25:45 +00:00
TreeHugger Robot
61eb68dae9
Merge "Update recently opened app string and "see all" summary"
2017-05-27 00:13:02 +00:00
Fan Zhang
206b774f79
Add # of active print jobs back to print setting summary
...
Change-Id: Iefdde7d9e5f13a892bceff7c676c4c7b9aa8d206
Fix: 37640842
Test: make RunSettingsRoboTests
2017-05-26 16:45:14 -07:00
Fan Zhang
83365ec6ea
Update recently opened app string and "see all" summary
...
Change-Id: I84a01f01ac1c685db87970c3137f30ba58c800b3
Fix: 62040104
Test: make RunSettingsRoboTests
2017-05-26 15:30:57 -07:00
TreeHugger Robot
ee991f4956
Merge "Misc logging changes"
2017-05-26 21:11:34 +00:00
Doris Ling
caeb067a57
Merge "Remove the duplicate test case that is added by auto-merge."
2017-05-26 20:29:52 +00:00
Christine Franks
94be10a820
Merge "Align settings seekbar to match other preferences" into oc-dev am: 532a88dcd0
...
am: f51db28428
Change-Id: Ia800103ddfe332c1e1cc2fe50df98d90122fda8a
2017-05-26 20:24:42 +00:00
Doris Ling
7ecd696dff
Remove the duplicate test case that is added by auto-merge.
...
Change-Id: I0f2f30eed80ab550c16c64a44407ce0199090550
Fix: 38302246
Test: make RunSettingsRoboTests
2017-05-26 13:22:13 -07:00
Christine Franks
f51db28428
Merge "Align settings seekbar to match other preferences" into oc-dev
...
am: 532a88dcd0
Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
2017-05-26 20:18:28 +00:00
Christine Franks
532a88dcd0
Merge "Align settings seekbar to match other preferences" into oc-dev
2017-05-26 20:12:26 +00:00
Qingxi Li
4e6e00489d
Merge "Hide "Wipe eUICC" option when it isn't useful."
2017-05-26 20:05:34 +00:00
Doris Ling
02981294b1
Merge "Fix issue for new account not being shown in work profile." into oc-dev am: dd7912e12f
...
am: 65dbe820bd
Change-Id: I4ced2b59e73ea155528964e927f7a07ed9d9a63f
2017-05-26 19:46:28 +00:00
Doris Ling
65dbe820bd
Merge "Fix issue for new account not being shown in work profile." into oc-dev
...
am: dd7912e12f
Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40
2017-05-26 19:42:56 +00:00
TreeHugger Robot
dd7912e12f
Merge "Fix issue for new account not being shown in work profile." into oc-dev
2017-05-26 19:38:38 +00:00
Fan Zhang
012028e3a3
Misc logging changes
...
- log search result count, rank when clicking search result.
- log app package when default app is changed
Change-Id: Idd11bd67caba2beaa59c65839c40db8c71787388
Fix: 62072727
Test: make RunSettingsRoboTests
2017-05-26 12:28:13 -07:00
TreeHugger Robot
ee1de74d0c
Merge "Move static search ranking from DatabaseResultLoader to Search Adapter."
2017-05-26 18:34:15 +00:00
TreeHugger Robot
613a4161ac
Merge "Reduce flakiess in account preference controller test."
2017-05-26 18:10:39 +00:00
Christine Franks
e85452fc7f
Align settings seekbar to match other preferences
...
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.
Bug: 62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.
Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
2017-05-26 10:50:06 -07:00
Fan Zhang
3cad98f69e
Merge "Update logPackageName() to use new MetricsLogger API"
2017-05-26 16:37:06 +00:00
Soroosh Mariooryad
683ccdf97b
Move static search ranking from DatabaseResultLoader to Search Adapter.
...
This will avoid unnecessary static ranking if smart ranking is used.
Since loader does not need to provided sorted collection of results,
the loading data type has changed from List<> to Set<>. This will also
faster lookup in the Adapter.
Fixes: 38447799
Test: make RunSettingsRoboTests
Change-Id: I448b29bd4e8700c8ec4b5766cbeab4b3087ae39a
2017-05-26 09:28:06 -07:00
Fan Zhang
bbe3683a6e
Merge "Fix a flaky test."
2017-05-26 16:14:09 +00:00
Julia Reynolds
f1239e1b84
Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3
...
am: 166a994a4c
Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281
2017-05-26 15:02:40 +00:00
Julia Reynolds
166a994a4c
Merge "Allow some system channels to be blocked" into oc-dev
...
am: 540e8f50e3
Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4
2017-05-26 14:54:11 +00:00
Julia Reynolds
540e8f50e3
Merge "Allow some system channels to be blocked" into oc-dev
2017-05-26 14:39:31 +00:00
Suprabh Shukla
f0d95eaa56
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev am: 136a3da4a3
...
am: 7f550afc37
Change-Id: I9bf4a1d951a8ee6a71fb9f8067d35f5f6877e2e6
2017-05-26 01:31:47 +00:00
Suprabh Shukla
7f550afc37
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
...
am: 136a3da4a3
Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
2017-05-26 01:18:05 +00:00
Fan Zhang
1f1fa944db
Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34
...
am: e8e23081fa
-s ours
Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce
2017-05-25 23:27:58 +00:00
jackqdyulei
5f5d409e54
Merge "Sort app list after smeared on screen" into oc-dev am: f68bb7e75c
...
am: 9a091aaac0
-s ours
Change-Id: Ie46aef992d573f45f308ab659d623f4f3972e04a
2017-05-25 23:27:26 +00:00
TreeHugger Robot
136a3da4a3
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
2017-05-25 23:18:01 +00:00
Fan Zhang
e8e23081fa
Merge "Show setting for work profile lock screen notification" into oc-dev
...
am: 5bb87f9f34
Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
2017-05-25 23:16:54 +00:00
jackqdyulei
9a091aaac0
Merge "Sort app list after smeared on screen" into oc-dev
...
am: f68bb7e75c
Change-Id: I96a82cc6e02f858fb00501ac122822aa2877cdf6
2017-05-25 23:16:24 +00:00
TreeHugger Robot
5bb87f9f34
Merge "Show setting for work profile lock screen notification" into oc-dev
2017-05-25 22:41:07 +00:00
TreeHugger Robot
f68bb7e75c
Merge "Sort app list after smeared on screen" into oc-dev
2017-05-25 22:41:00 +00:00
Daniel Nishi
4ab4ff8bec
Fix a flaky test.
...
If a test with an initialized fake factory was run before this test, it
passed. If it runs first, though, it would flake. By initializing the
fake factory in the test, it shouldn't flake anymore.
Change-Id: I3ecb7477b6b29d093059f01d5dc0124690fb15b3
Fixes: 62103876
Test: Robotests pass
2017-05-25 15:34:03 -07:00
TreeHugger Robot
3d4faff784
Merge "Add logging to default browser preference controller"
2017-05-25 21:27:23 +00:00
Fan Zhang
7a98912c94
Update logPackageName() to use new MetricsLogger API
...
Bug: 38258793
Test: make RunSettingsRoboTests
Change-Id: Id08e5655bdaaf0cabd952b07278cd0daf7b59a3b
2017-05-25 13:51:49 -07:00
TreeHugger Robot
5c4b1f095e
Merge "Show setting for work profile lock screen notification"
2017-05-25 20:37:50 +00:00
Alison Cichowlas
de01ab40a5
Merge "Update notification settings to match Notification Dot branding." into oc-dev am: ed8b39fe60
...
am: a974b8c595
Change-Id: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
2017-05-25 20:21:48 +00:00
Lei Yu
e3aefdc320
Merge "Add NPE check for refreshUi" into oc-dev am: 1a8c2dd899
...
am: 9e56dd44cd
Change-Id: Id487b717c57c211f9a80f584bd518b6b5267d480
2017-05-25 20:21:19 +00:00
Fan Zhang
bfbe45fd95
Reduce flakiess in account preference controller test.
...
The getDrawable method from AuthenticatorHelper randomly fails and
causes test flake. Replaced with a shadow.
Test: rerun robotests
Change-Id: I39afeb9082a35786a05c0e8e5adc337c850ad666
2017-05-25 13:17:43 -07:00
Alison Cichowlas
a974b8c595
Merge "Update notification settings to match Notification Dot branding." into oc-dev
...
am: ed8b39fe60
Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
2017-05-25 20:09:22 +00:00
Lei Yu
9e56dd44cd
Merge "Add NPE check for refreshUi" into oc-dev
...
am: 1a8c2dd899
Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028
2017-05-25 20:07:20 +00:00
TreeHugger Robot
ed8b39fe60
Merge "Update notification settings to match Notification Dot branding." into oc-dev
2017-05-25 20:06:28 +00:00
Lei Yu
1a8c2dd899
Merge "Add NPE check for refreshUi" into oc-dev
2017-05-25 19:51:14 +00:00
TreeHugger Robot
5452b5474f
Merge "Add setIconContentDescription to EntityHeaderController"
2017-05-25 19:45:32 +00:00
Fan Zhang
378967484a
Add logging to default browser preference controller
...
Bug: 38480521
Test: manual
Change-Id: I1b0d389f0aa6cc4c9d1895e4cae4d0561df0f0ca
2017-05-25 12:22:21 -07:00
Fan Zhang
879f079e04
Show setting for work profile lock screen notification
...
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Fan Zhang
33c493777b
Show setting for work profile lock screen notification
...
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.
cherry-pick of: ag/2315314
Bug: 62051309
Bug: 62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
2017-05-25 11:49:10 -07:00
Julia Reynolds
3a77e1d4a0
Allow some system channels to be blocked
...
Test: manual
Bug: 38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0
2017-05-25 14:26:58 -04:00