Commit Graph

36497 Commits

Author SHA1 Message Date
TreeHugger Robot
a66a8b74b5 Merge "Bluetooth: Enable in-band ringing by default (1/2)" 2017-05-31 03:36:17 +00:00
TreeHugger Robot
2945ffb76f Merge "Resize fingerprint added illustration to specs" 2017-05-31 03:35:36 +00:00
TreeHugger Robot
f7f5196cf5 Merge "AccountTypePreference layout clean up." 2017-05-31 02:22:06 +00:00
TreeHugger Robot
c2a48b1da1 Merge "Revert "Revert "Share preference controller in AdavancedAppSettings search""" 2017-05-31 02:14:01 +00:00
Hugo Benichi
2d31889379 Merge "Wifi details page: sign-in uses primary color" into oc-dev am: 0c5573a0e3
am: 5716f6cc7e

Change-Id: Ifb6f4a26fbbcd356f7fc0ff25c552cdd9da5c73d
2017-05-31 00:47:54 +00:00
Fan Zhang
c62808a5a3 Revert "Revert "Share preference controller in AdavancedAppSettings search""
Bug: 62141436
Test: make RunSettingsRoboTests -j40
This reverts commit b2676a769e.

Change-Id: I27c8df94a3103602d2e176670bcf1f82528e70c0
2017-05-30 17:47:41 -07:00
Fan Zhang
f555e75c22 Merge "Revert "Share preference controller in AdavancedAppSettings search"" 2017-05-31 00:42:54 +00:00
Fan Zhang
b2676a769e Revert "Share preference controller in AdavancedAppSettings search"
Bug: 62141436

It has failing robolectric test but treehugger didn't catch it for some reason.

This reverts commit 3541f597a4.

Change-Id: Id4bc0ba2d5995092c625a54fa415ff0c2c6785cb
2017-05-31 00:42:22 +00:00
Hugo Benichi
5716f6cc7e Merge "Wifi details page: sign-in uses primary color" into oc-dev
am: 0c5573a0e3

Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
2017-05-31 00:27:43 +00:00
Hugo Benichi
0c5573a0e3 Merge "Wifi details page: sign-in uses primary color" into oc-dev 2017-05-31 00:16:43 +00:00
Suprabh Shukla
6ac7b8c6be Merge "Disabling the activate button when paused" into oc-dev am: dacdcb9b42
am: 04c93c6628

Change-Id: Idad6231a35a90b401651effd59123a647985336f
2017-05-30 23:20:08 +00:00
TreeHugger Robot
b713d16315 Merge "Add string needed by new device suggestion" 2017-05-30 23:12:19 +00:00
Suprabh Shukla
04c93c6628 Merge "Disabling the activate button when paused" into oc-dev
am: dacdcb9b42

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
2017-05-30 23:12:10 +00:00
Suprabh Shukla
dacdcb9b42 Merge "Disabling the activate button when paused" into oc-dev 2017-05-30 23:02:15 +00: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
Phil Weaver
56f3c8eb3d Merge "Fix clickjacking again for accessibility services" into oc-dev am: 7348c5c91b
am: 91df0c9a03  -s ours

Change-Id: I683f75c1b25b74d060c8ad0dc89063dc1f303eba
2017-05-30 22:10:53 +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
Fan Zhang
66a3d72cf6 Add string needed by new device suggestion
Bug: 62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
2017-05-30 14:24:10 -07:00
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
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
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
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
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
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