Matthew Fritze
26bd4d1807
Merge "Location summary is no longer indexed" into oc-dev am: fed6e817a5
...
am: 53c8d6c2b2
Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb
2017-05-30 20:51:00 +00:00
TreeHugger Robot
cf162d1291
Merge "Extend single line summary preference to multi line."
2017-05-30 20:48:18 +00:00
Matthew Fritze
53c8d6c2b2
Merge "Location summary is no longer indexed" into oc-dev
...
am: fed6e817a5
Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
2017-05-30 20:38:57 +00:00
Daniel Sheng
64c3677169
Merge "Tweaked camera lift trigger suggestion summary."
2017-05-30 20:36:31 +00:00
TreeHugger Robot
fed6e817a5
Merge "Location summary is no longer indexed" into oc-dev
2017-05-30 20:24:23 +00:00
Daniel Nishi
4fcb5f6b7c
Merge "Fix an override filter bug." into oc-dev am: 5cc0a122d3
...
am: 23c2cf1d68
Change-Id: I88545ebb5e3a1b05268b7485c0d7dc4323ff661f
2017-05-30 19:54:19 +00:00
Daniel Nishi
23c2cf1d68
Merge "Fix an override filter bug." into oc-dev
...
am: 5cc0a122d3
Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
2017-05-30 19:50:21 +00:00
Phil Weaver
64822d40dc
Merge "Manual merge of ag/2319717"
2017-05-30 19:46:18 +00:00
Daniel Nishi
5cc0a122d3
Merge "Fix an override filter bug." into oc-dev
2017-05-30 19:44:38 +00:00
TreeHugger Robot
5d2377f66a
Merge "Disallow adding/editing dun APNs unless allowed by carrier."
2017-05-30 19:38:30 +00:00
TreeHugger Robot
94c57104d6
Merge "Use the standard place holder for the security summary."
2017-05-30 19:33:07 +00:00
Fan Zhang
d35f90c289
Extend single line summary preference to multi line.
...
also updated some strings char limit.
Change-Id: Ie068ecc410bb8211b4cd5e32a5539c824c48040f
Fix: 36413664
Fix: 62079108
Test: make RunSettingsRoboTests
2017-05-30 11:48:20 -07:00
Daniel Sheng
501963640a
Tweaked camera lift trigger suggestion summary.
...
Bug: 62190621
Test: manual
Updating camera lift trigger strings based on dogfood feedback.
Change-Id: I27fe0f35db4f979c3bc5580f03d2c3c55dc54e67
2017-05-30 10:59:31 -07:00
Phil Weaver
2e2dbfe549
Manual merge of ag/2319717
...
Bug: 62104030
Test: Manually tested as described in original commit msg.
Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd
2017-05-30 10:41:52 -07:00
Matthew Fritze
a223355c8f
Location summary is no longer indexed
...
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes: 38254258
Test: Search "mode" -> no summary text
2017-05-30 09:58:55 -07:00
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
William Luh
0cfbee0581
Use the standard place holder for the security summary.
...
This removes the jitter when the cache is empty and there is
initially no summary, and then it is replaced by the fetched summary
when it's available.
Bug:36463348
Test: make RunSettingsRoboTests
Change-Id: I92cafbf23e3c562a470488dea28fd5106bbdf885
2017-05-26 16:47:09 -07: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