Commit Graph

17940 Commits

Author SHA1 Message Date
Suprabh Shukla
dacdcb9b42 Merge "Disabling the activate button when paused" into oc-dev 2017-05-30 23:02:15 +00:00
jackqdyulei
de3bb7194d Add method to calculate last full charge time
Bug: 38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
2017-05-30 15:51:29 -07:00
Jack He
52978360e1 Bluetooth: Enable in-band ringing by default (1/2)
Bug: 19171297
Test: make, make calls, HFP regression
Change-Id: Id1d44e07a939d121ccf05466239d3cb5cc4b3199
2017-05-30 15:17:33 -07:00
Rebecca Silberstein
141e442e26 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am: bbc260d408
am: cba166d380

Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd
2017-05-30 22:11:21 +00:00
Rebecca Silberstein
cba166d380 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am: bbc260d408

Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
2017-05-30 22:02:18 +00:00
Phil Weaver
91df0c9a03 Merge "Fix clickjacking again for accessibility services" into oc-dev
am: 7348c5c91b

Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
2017-05-30 22:01:40 +00:00
Fan Zhang
d00f006236 AccountTypePreference layout clean up.
Bug: 35961001
Test: visual
Change-Id: Iaeb605e7eed0d75a77d893f6b849e26482311b08
2017-05-30 14:52:51 -07:00
Rebecca Silberstein
bbc260d408 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev 2017-05-30 21:48:37 +00:00
Phil Weaver
7348c5c91b Merge "Fix clickjacking again for accessibility services" into oc-dev 2017-05-30 21:45:37 +00:00
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
Maurice Lam
7551c80bc8 Pass component name into SuggestionFeatureProvider
So that the provider can be used for more than one suggestion.

Test: Robolectric test for implementation of the provider
Bug: 62039057
Change-Id: Ibea41ea6d98e67c55ec157556675e854f3ea31c4
2017-05-30 13:07:51 -07: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
Rebecca Silberstein
deca11c87d SettingsAppWidgetProvider: do not use setWifiApEnabled
Calls to stop tethering should use stopTethering instead of
setWifiApEnabled.

Bug: 38017909
Test: manual
Change-Id: Ib43f8c29b190ba7bad9c5b2d6a01bc9558110890
2017-05-30 11:40:16 -07:00
Phil Weaver
ed0866ebfd Fix clickjacking again for accessibility services
Turns out that the flag for the window being obscured
does not imply that it is also partially obscured.

Also blocking system alerts and toast windows over the
accessibility service preference screen (and its associated
warning dialog) as well as the warning dialog shown when
a service is made available with the accessibiity shortcut.

Bug: 62104030
Test: Manually verified that I can't enable Select to Speak
when switch access is highlighting the button. I am able to
do that without this fix. Also started a service that
displayed a system overlay and confirmed that the overlay
disappears on a11y service preference screens and when a
new service is configured for the a11y shortcut.
Merged-In: Ie00bafa736c837881a258c9de10891b27c5baefd

Change-Id: Iabbded1a12dbc33d76e51c0bac710280a88080f3
2017-05-30 10:45:23 -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
Esteban Talavera
11e4b2c3f1 Launchers that don't support managed profiles cannot be selected
If there is a managed profile, launchers that don't support managed profiles
cannot be selected as default Home

Change-Id: I7a19b5951402ec87a48464d783a539a607adabfe
Fix: 62013411
Test: m RunSettingsRoboTests
2017-05-30 11:39:39 +01:00
Hugo Benichi
484140ba6e Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug: 36203355
Bug: 36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
2017-05-29 22:22:27 +09: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
Suprabh Shukla
05c8eb5fd0 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-05-26 15:53:32 -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
jackqdyulei
03539a07e4 Add method to calculate last full charge time
Bug: 38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
2017-05-26 13:21:42 -07: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
jackqdyulei
2b2abac714 Update updateEmptyView
Also consider the visiblity of list container, when list container
is invisible, we should show the empty view.

Bug: 62062415
Test: RunSettingsRoboTests
Change-Id: I065e70386242c425ef3cbfb2b703a5433dbe40c1
2017-05-26 10:53:53 -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
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
Maurice Lam
8df7173043 Change header in choose lock password
Instead of a separate headerText view, change the header in the
GlifLayout directly.

Test: Manual. Existing tests pass
Bug: 38180862
Change-Id: I02d692870f5e2230ccae87a5ac2aee4def8f61af
2017-05-26 01:00:41 +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