Commit Graph

17287 Commits

Author SHA1 Message Date
TreeHugger Robot
08a02c439d Merge "Share preference controller in AdavancedAppSettings search" 2017-05-30 21:41:57 +00:00
TreeHugger Robot
cf162d1291 Merge "Extend single line summary preference to multi line." 2017-05-30 20:48:18 +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
Fan Zhang
3541f597a4 Share preference controller in AdavancedAppSettings search
Change-Id: I4283f35a91ce10e01fa4c9d1cf626b1d2a30082c
Fix: 62141436
Test: make RunSettingsRoboTests
2017-05-30 12:51:08 -07: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
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
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
Qingxi Li
4e6e00489d Merge "Hide "Wipe eUICC" option when it isn't useful." 2017-05-26 20:05:34 +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
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
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
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
TreeHugger Robot
3d4faff784 Merge "Add logging to default browser preference controller" 2017-05-25 21:27:23 +00:00
Daniel Nishi
5d0888be75 Fix an override filter bug.
The override filter for storage to ensure that we filter by UUID and
user id was designed as an override filter. This worked as long as there
never was any other filters which could be used out of Storage Settings.
It turns out the instant apps filter applies here.

As a result, I've moved these filters into being "composite filters"
which are composed with the primary filter instead of overriding the
primary filter.

Fixes: 35245772
Test: Settings Robotests... but as for the composing part it is
b/34768986

Change-Id: I6f5acb909568ab02e81187c09fdda9533d635781
2017-05-25 14:23:29 -07: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
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
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
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
Maurice Lam
ebb8294333 Support find sensor screen with no animation
Some illustration view can manage their own start-stop lifecycle and
doesn't need to be handled by the activity.

Make mAnimation null if the animation is not an instance of
FingerprintFindSensorAnimation.

Test: cd tests/robotests && mma
Bug: 38463695
Change-Id: I41989e5cb0639407f58d9c8edda0eef93adbf2e8
2017-05-25 11:21:16 -07:00
jackqdyulei
f984b1e1ae Sort app list after smeared on screen
Then we could make sure the app list is sorted

Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-25 10:09:05 -07:00
Philip Quinn
a0d327a5ac Merge "Add metrics category for the assist gesture settings." 2017-05-25 16:18:54 +00:00