OSDN Git Service
TreeHugger Robot [Wed, 31 May 2017 14:55:30 +0000 (14:55 +0000)]
Merge "Add related assist-gesture keywords"
Esteban Talavera [Wed, 31 May 2017 12:09:31 +0000 (12:09 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev am:
535533680f
am:
112f8d88fd
Change-Id: I23d0ee4977fc544b35723512977670cd2686c7d1
Esteban Talavera [Wed, 31 May 2017 12:04:57 +0000 (12:04 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am:
535533680f
Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628
TreeHugger Robot [Wed, 31 May 2017 11:58:38 +0000 (11:58 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
Adrian Roos [Wed, 31 May 2017 04:33:33 +0000 (04:33 +0000)]
Merge "Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential"
Adrian Roos [Wed, 31 May 2017 04:25:38 +0000 (04:25 +0000)]
Merge "AOD: Ambient display settings to dedicated settings screen"
TreeHugger Robot [Wed, 31 May 2017 03:48:56 +0000 (03:48 +0000)]
Merge "Change header in choose lock password"
TreeHugger Robot [Wed, 31 May 2017 03:36:15 +0000 (03:36 +0000)]
Merge "Bluetooth: Enable in-band ringing by default (1/2)"
TreeHugger Robot [Wed, 31 May 2017 03:35:35 +0000 (03:35 +0000)]
Merge "Resize fingerprint added illustration to specs"
TreeHugger Robot [Wed, 31 May 2017 02:22:04 +0000 (02:22 +0000)]
Merge "AccountTypePreference layout clean up."
TreeHugger Robot [Wed, 31 May 2017 02:13:59 +0000 (02:13 +0000)]
Merge "Revert "Revert "Share preference controller in AdavancedAppSettings search"""
Adrian Roos [Fri, 31 Mar 2017 01:02:25 +0000 (18:02 -0700)]
Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential
Bug:
36814845
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
Change-Id: Id6ce6bc5ebd9c9e2a88790cc800678aff50e580f
Hugo Benichi [Wed, 31 May 2017 00:47:54 +0000 (00:47 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev am:
0c5573a0e3
am:
5716f6cc7e
Change-Id: Ifb6f4a26fbbcd356f7fc0ff25c552cdd9da5c73d
Fan Zhang [Wed, 31 May 2017 00:43:18 +0000 (00:43 +0000)]
Revert "Revert "Share preference controller in AdavancedAppSettings search""
Bug:
62141436
Test: make RunSettingsRoboTests -j40
This reverts commit
b2676a769eaad4a24544e341f9a912620fc3cc9e.
Change-Id: I27c8df94a3103602d2e176670bcf1f82528e70c0
Fan Zhang [Wed, 31 May 2017 00:42:52 +0000 (00:42 +0000)]
Merge "Revert "Share preference controller in AdavancedAppSettings search""
Fan Zhang [Wed, 31 May 2017 00:42:22 +0000 (00:42 +0000)]
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
3541f597a429cd88846c131a327faa21833d7740.
Change-Id: Id4bc0ba2d5995092c625a54fa415ff0c2c6785cb
Hugo Benichi [Wed, 31 May 2017 00:27:43 +0000 (00:27 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
am:
0c5573a0e3
Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
Hugo Benichi [Wed, 31 May 2017 00:16:41 +0000 (00:16 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
Adrian Roos [Thu, 25 May 2017 22:49:35 +0000 (15:49 -0700)]
AOD: Ambient display settings to dedicated settings screen
Bug:
33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
Suprabh Shukla [Tue, 30 May 2017 23:20:08 +0000 (23:20 +0000)]
Merge "Disabling the activate button when paused" into oc-dev am:
dacdcb9b42
am:
04c93c6628
Change-Id: Idad6231a35a90b401651effd59123a647985336f
TreeHugger Robot [Tue, 30 May 2017 23:12:18 +0000 (23:12 +0000)]
Merge "Add string needed by new device suggestion"
Suprabh Shukla [Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
am:
dacdcb9b42
Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
Suprabh Shukla [Tue, 30 May 2017 23:02:09 +0000 (23:02 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
Jack He [Tue, 30 May 2017 22:17:33 +0000 (15:17 -0700)]
Bluetooth: Enable in-band ringing by default (1/2)
Bug:
19171297
Test: make, make calls, HFP regression
Change-Id: Id1d44e07a939d121ccf05466239d3cb5cc4b3199
Rebecca Silberstein [Tue, 30 May 2017 22:11:21 +0000 (22:11 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am:
bbc260d408
am:
cba166d380
Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd
Phil Weaver [Tue, 30 May 2017 22:10:53 +0000 (22:10 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev am:
7348c5c91b
am:
91df0c9a03 -s ours
Change-Id: I683f75c1b25b74d060c8ad0dc89063dc1f303eba
Rebecca Silberstein [Tue, 30 May 2017 22:02:18 +0000 (22:02 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am:
bbc260d408
Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
Phil Weaver [Tue, 30 May 2017 22:01:40 +0000 (22:01 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
am:
7348c5c91b
Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
Fan Zhang [Tue, 30 May 2017 21:50:08 +0000 (14:50 -0700)]
AccountTypePreference layout clean up.
Bug:
35961001
Test: visual
Change-Id: Iaeb605e7eed0d75a77d893f6b849e26482311b08
Rebecca Silberstein [Tue, 30 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
Phil Weaver [Tue, 30 May 2017 21:45:36 +0000 (21:45 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
TreeHugger Robot [Tue, 30 May 2017 21:41:55 +0000 (21:41 +0000)]
Merge "Share preference controller in AdavancedAppSettings search"
Fan Zhang [Tue, 30 May 2017 21:24:10 +0000 (14:24 -0700)]
Add string needed by new device suggestion
Bug:
62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
Matthew Fritze [Tue, 30 May 2017 20:51:00 +0000 (20:51 +0000)]
Merge "Location summary is no longer indexed" into oc-dev am:
fed6e817a5
am:
53c8d6c2b2
Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb
TreeHugger Robot [Tue, 30 May 2017 20:48:13 +0000 (20:48 +0000)]
Merge "Extend single line summary preference to multi line."
Matthew Fritze [Tue, 30 May 2017 20:38:57 +0000 (20:38 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
am:
fed6e817a5
Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
Daniel Sheng [Tue, 30 May 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Tweaked camera lift trigger suggestion summary."
TreeHugger Robot [Tue, 30 May 2017 20:24:22 +0000 (20:24 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
Matthew Fritze [Tue, 30 May 2017 20:05:38 +0000 (13:05 -0700)]
Add related assist-gesture keywords
Wake squeeze and alarm gestures are for settings under
development.
Bug:
62191990
Test: string changes
Change-Id: Iac22a9ab9e63f1e3d97f62d3c470cf07b5da3636
Daniel Nishi [Tue, 30 May 2017 19:54:19 +0000 (19:54 +0000)]
Merge "Fix an override filter bug." into oc-dev am:
5cc0a122d3
am:
23c2cf1d68
Change-Id: I88545ebb5e3a1b05268b7485c0d7dc4323ff661f
Fan Zhang [Tue, 30 May 2017 19:47:17 +0000 (12:47 -0700)]
Share preference controller in AdavancedAppSettings search
Change-Id: I4283f35a91ce10e01fa4c9d1cf626b1d2a30082c
Fix:
62141436
Test: make RunSettingsRoboTests
Daniel Nishi [Tue, 30 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Fix an override filter bug." into oc-dev
am:
5cc0a122d3
Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
Phil Weaver [Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)]
Merge "Manual merge of ag/
2319717"
Daniel Nishi [Tue, 30 May 2017 19:44:36 +0000 (19:44 +0000)]
Merge "Fix an override filter bug." into oc-dev
TreeHugger Robot [Tue, 30 May 2017 19:38:29 +0000 (19:38 +0000)]
Merge "Disallow adding/editing dun APNs unless allowed by carrier."
TreeHugger Robot [Tue, 30 May 2017 19:33:05 +0000 (19:33 +0000)]
Merge "Use the standard place holder for the security summary."
Fan Zhang [Sat, 27 May 2017 00:23:59 +0000 (17:23 -0700)]
Extend single line summary preference to multi line.
also updated some strings char limit.
Change-Id: Ie068ecc410bb8211b4cd5e32a5539c824c48040f
Fix:
36413664
Fix:
62079108
Test: make RunSettingsRoboTests
Rebecca Silberstein [Thu, 25 May 2017 09:50:29 +0000 (02:50 -0700)]
SettingsAppWidgetProvider: do not use setWifiApEnabled
Calls to stop tethering should use stopTethering instead of
setWifiApEnabled.
Bug:
38017909
Test: manual
Change-Id: Ib43f8c29b190ba7bad9c5b2d6a01bc9558110890
Daniel Sheng [Tue, 30 May 2017 17:43:13 +0000 (10:43 -0700)]
Tweaked camera lift trigger suggestion summary.
Bug:
62190621
Test: manual
Updating camera lift trigger strings based on dogfood feedback.
Change-Id: I27fe0f35db4f979c3bc5580f03d2c3c55dc54e67
Phil Weaver [Fri, 26 May 2017 00:02:21 +0000 (17:02 -0700)]
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
Phil Weaver [Tue, 30 May 2017 17:41:52 +0000 (10:41 -0700)]
Manual merge of ag/
2319717
Bug:
62104030
Test: Manually tested as described in original commit msg.
Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd
Matthew Fritze [Tue, 30 May 2017 16:58:55 +0000 (09:58 -0700)]
Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes:
38254258
Test: Search "mode" -> no summary text
Esteban Talavera [Thu, 25 May 2017 10:23:04 +0000 (11:23 +0100)]
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
Hugo Benichi [Fri, 26 May 2017 06:45:03 +0000 (15:45 +0900)]
Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug:
36203355
Bug:
36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
Maurice Lam [Sat, 27 May 2017 02:46:04 +0000 (02:46 +0000)]
Merge "Support find sensor screen with no animation"
TreeHugger Robot [Sat, 27 May 2017 01:25:44 +0000 (01:25 +0000)]
Merge "Add # of active print jobs back to print setting summary"
TreeHugger Robot [Sat, 27 May 2017 00:13:01 +0000 (00:13 +0000)]
Merge "Update recently opened app string and "see all" summary"
William Luh [Fri, 26 May 2017 23:10:51 +0000 (16:10 -0700)]
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
Fan Zhang [Fri, 26 May 2017 23:39:28 +0000 (16:39 -0700)]
Add # of active print jobs back to print setting summary
Change-Id: Iefdde7d9e5f13a892bceff7c676c4c7b9aa8d206
Fix:
37640842
Test: make RunSettingsRoboTests
Suprabh Shukla [Mon, 22 May 2017 22:20:06 +0000 (15:20 -0700)]
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
Fan Zhang [Fri, 26 May 2017 19:58:44 +0000 (12:58 -0700)]
Update recently opened app string and "see all" summary
Change-Id: I84a01f01ac1c685db87970c3137f30ba58c800b3
Fix:
62040104
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 26 May 2017 21:11:32 +0000 (21:11 +0000)]
Merge "Misc logging changes"
Doris Ling [Fri, 26 May 2017 20:29:52 +0000 (20:29 +0000)]
Merge "Remove the duplicate test case that is added by auto-merge."
Christine Franks [Fri, 26 May 2017 20:24:42 +0000 (20:24 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev am:
532a88dcd0
am:
f51db28428
Change-Id: Ia800103ddfe332c1e1cc2fe50df98d90122fda8a
Doris Ling [Fri, 26 May 2017 20:22:13 +0000 (13:22 -0700)]
Remove the duplicate test case that is added by auto-merge.
Change-Id: I0f2f30eed80ab550c16c64a44407ce0199090550
Fix:
38302246
Test: make RunSettingsRoboTests
Christine Franks [Fri, 26 May 2017 20:18:28 +0000 (20:18 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
am:
532a88dcd0
Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
Qingxi Li [Fri, 26 May 2017 20:05:33 +0000 (20:05 +0000)]
Merge "Hide "Wipe eUICC" option when it isn't useful."
Doris Ling [Fri, 26 May 2017 19:46:28 +0000 (19:46 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev am:
dd7912e12f
am:
65dbe820bd
Change-Id: I4ced2b59e73ea155528964e927f7a07ed9d9a63f
Doris Ling [Fri, 26 May 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
am:
dd7912e12f
Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40
TreeHugger Robot [Fri, 26 May 2017 19:38:37 +0000 (19:38 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
Fan Zhang [Thu, 25 May 2017 22:58:08 +0000 (15:58 -0700)]
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
TreeHugger Robot [Fri, 26 May 2017 18:34:13 +0000 (18:34 +0000)]
Merge "Move static search ranking from DatabaseResultLoader to Search Adapter."
TreeHugger Robot [Fri, 26 May 2017 18:10:38 +0000 (18:10 +0000)]
Merge "Reduce flakiess in account preference controller test."
Christine Franks [Fri, 26 May 2017 17:24:45 +0000 (10:24 -0700)]
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
Fan Zhang [Fri, 26 May 2017 16:37:05 +0000 (16:37 +0000)]
Merge "Update logPackageName() to use new MetricsLogger API"
Soroosh Mariooryad [Thu, 25 May 2017 21:15:00 +0000 (14:15 -0700)]
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
Fan Zhang [Fri, 26 May 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Fix a flaky test."
Julia Reynolds [Fri, 26 May 2017 15:02:40 +0000 (15:02 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev am:
540e8f50e3
am:
166a994a4c
Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281
Julia Reynolds [Fri, 26 May 2017 14:54:11 +0000 (14:54 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
am:
540e8f50e3
Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev
Suprabh Shukla [Fri, 26 May 2017 01:31:47 +0000 (01:31 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev am:
136a3da4a3
am:
7f550afc37
Change-Id: I9bf4a1d951a8ee6a71fb9f8067d35f5f6877e2e6
Suprabh Shukla [Fri, 26 May 2017 01:18:05 +0000 (01:18 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am:
136a3da4a3
Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
Maurice Lam [Fri, 19 May 2017 03:42:58 +0000 (20:42 -0700)]
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
Fan Zhang [Thu, 25 May 2017 23:27:58 +0000 (23:27 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev am:
5bb87f9f34
am:
e8e23081fa -s ours
Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce
jackqdyulei [Thu, 25 May 2017 23:27:26 +0000 (23:27 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev am:
f68bb7e75c
am:
9a091aaac0 -s ours
Change-Id: Ie46aef992d573f45f308ab659d623f4f3972e04a
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
Fan Zhang [Thu, 25 May 2017 23:16:54 +0000 (23:16 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
am:
5bb87f9f34
Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
jackqdyulei [Thu, 25 May 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
am:
f68bb7e75c
Change-Id: I96a82cc6e02f858fb00501ac122822aa2877cdf6
TreeHugger Robot [Thu, 25 May 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Show setting for work profile lock screen notification" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Sort app list after smeared on screen" into oc-dev
Daniel Nishi [Thu, 25 May 2017 22:34:03 +0000 (15:34 -0700)]
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
TreeHugger Robot [Thu, 25 May 2017 21:27:22 +0000 (21:27 +0000)]
Merge "Add logging to default browser preference controller"
Daniel Nishi [Mon, 22 May 2017 23:33:32 +0000 (16:33 -0700)]
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
Fan Zhang [Thu, 25 May 2017 20:48:22 +0000 (13:48 -0700)]
Update logPackageName() to use new MetricsLogger API
Bug:
38258793
Test: make RunSettingsRoboTests
Change-Id: Id08e5655bdaaf0cabd952b07278cd0daf7b59a3b
TreeHugger Robot [Thu, 25 May 2017 20:37:48 +0000 (20:37 +0000)]
Merge "Show setting for work profile lock screen notification"
Alison Cichowlas [Thu, 25 May 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev am:
ed8b39fe60
am:
a974b8c595
Change-Id: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Lei Yu [Thu, 25 May 2017 20:21:19 +0000 (20:21 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev am:
1a8c2dd899
am:
9e56dd44cd
Change-Id: Id487b717c57c211f9a80f584bd518b6b5267d480
Fan Zhang [Thu, 25 May 2017 20:17:43 +0000 (13:17 -0700)]
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
Alison Cichowlas [Thu, 25 May 2017 20:09:22 +0000 (20:09 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev
am:
ed8b39fe60
Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5