OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Add string needed by new device suggestion"
TreeHugger Robot [Tue, 30 May 2017 23:12:18 +0000 (23:12 +0000)]
Merge "Add string needed by new device suggestion"

7 years agoMerge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am: bbc260d408
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

7 years agoMerge "Fix clickjacking again for accessibility services" into oc-dev am: 7348c5c91b
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

7 years agoMerge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
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

7 years agoMerge "Fix clickjacking again for accessibility services" into oc-dev
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

7 years agoMerge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
Rebecca Silberstein [Tue, 30 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev

7 years agoMerge "Fix clickjacking again for accessibility services" 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

7 years agoMerge "Share preference controller in AdavancedAppSettings search"
TreeHugger Robot [Tue, 30 May 2017 21:41:55 +0000 (21:41 +0000)]
Merge "Share preference controller in AdavancedAppSettings search"

7 years agoAdd string needed by new device suggestion
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

7 years agoMerge "Location summary is no longer indexed" into oc-dev am: fed6e817a5
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

7 years agoMerge "Extend single line summary preference to multi line."
TreeHugger Robot [Tue, 30 May 2017 20:48:13 +0000 (20:48 +0000)]
Merge "Extend single line summary preference to multi line."

7 years agoMerge "Location summary is no longer indexed" into oc-dev
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

7 years agoMerge "Tweaked camera lift trigger suggestion summary."
Daniel Sheng [Tue, 30 May 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Tweaked camera lift trigger suggestion summary."

7 years agoMerge "Location summary is no longer indexed" into oc-dev
TreeHugger Robot [Tue, 30 May 2017 20:24:22 +0000 (20:24 +0000)]
Merge "Location summary is no longer indexed" into oc-dev

7 years agoMerge "Fix an override filter bug." into oc-dev am: 5cc0a122d3
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

7 years agoShare preference controller in AdavancedAppSettings search
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

7 years agoMerge "Fix an override filter bug." into oc-dev
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

7 years agoMerge "Manual merge of ag/2319717"
Phil Weaver [Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)]
Merge "Manual merge of ag/2319717"

7 years agoMerge "Fix an override filter bug." into oc-dev
Daniel Nishi [Tue, 30 May 2017 19:44:36 +0000 (19:44 +0000)]
Merge "Fix an override filter bug." into oc-dev

7 years agoMerge "Disallow adding/editing dun APNs unless allowed by carrier."
TreeHugger Robot [Tue, 30 May 2017 19:38:29 +0000 (19:38 +0000)]
Merge "Disallow adding/editing dun APNs unless allowed by carrier."

7 years agoMerge "Use the standard place holder for the security summary."
TreeHugger Robot [Tue, 30 May 2017 19:33:05 +0000 (19:33 +0000)]
Merge "Use the standard place holder for the security summary."

7 years agoExtend single line summary preference to multi line.
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

7 years agoSettingsAppWidgetProvider: do not use setWifiApEnabled
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

7 years agoTweaked camera lift trigger suggestion summary.
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

7 years agoFix clickjacking again for accessibility services
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

7 years agoManual merge of ag/2319717
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

7 years agoLocation summary is no longer indexed
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

7 years agoMerge "Support find sensor screen with no animation"
Maurice Lam [Sat, 27 May 2017 02:46:04 +0000 (02:46 +0000)]
Merge "Support find sensor screen with no animation"

7 years agoMerge "Add # of active print jobs back to print setting summary"
TreeHugger Robot [Sat, 27 May 2017 01:25:44 +0000 (01:25 +0000)]
Merge "Add # of active print jobs back to print setting summary"

7 years agoMerge "Update recently opened app string and "see all" summary"
TreeHugger Robot [Sat, 27 May 2017 00:13:01 +0000 (00:13 +0000)]
Merge "Update recently opened app string and "see all" summary"

7 years agoUse the standard place holder for the security 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

7 years agoAdd # of active print jobs back to print setting summary
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

7 years agoUpdate recently opened app string and "see all" summary
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

7 years agoMerge "Misc logging changes"
TreeHugger Robot [Fri, 26 May 2017 21:11:32 +0000 (21:11 +0000)]
Merge "Misc logging changes"

7 years agoMerge "Remove the duplicate test case that is added by auto-merge."
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."

7 years agoMerge "Align settings seekbar to match other preferences" into oc-dev am: 532a88dcd0
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

7 years agoRemove the duplicate test case that is added by auto-merge.
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

7 years agoMerge "Align settings seekbar to match other preferences" into oc-dev
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

7 years agoMerge "Align settings seekbar to match other preferences" into oc-dev
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev

7 years agoMerge "Hide "Wipe eUICC" option when it isn't useful."
Qingxi Li [Fri, 26 May 2017 20:05:33 +0000 (20:05 +0000)]
Merge "Hide "Wipe eUICC" option when it isn't useful."

7 years agoMerge "Fix issue for new account not being shown in work profile." into oc-dev am...
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

7 years agoMerge "Fix issue for new account not being shown in work profile." into oc-dev
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

7 years agoMerge "Fix issue for new account not being shown in work profile." into oc-dev
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

7 years agoMisc logging changes
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

7 years agoMerge "Move static search ranking from DatabaseResultLoader to Search Adapter."
TreeHugger Robot [Fri, 26 May 2017 18:34:13 +0000 (18:34 +0000)]
Merge "Move static search ranking from DatabaseResultLoader to Search Adapter."

7 years agoMerge "Reduce flakiess in account preference controller test."
TreeHugger Robot [Fri, 26 May 2017 18:10:38 +0000 (18:10 +0000)]
Merge "Reduce flakiess in account preference controller test."

7 years agoAlign settings seekbar to match other preferences
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

7 years agoMerge "Update logPackageName() to use new MetricsLogger API"
Fan Zhang [Fri, 26 May 2017 16:37:05 +0000 (16:37 +0000)]
Merge "Update logPackageName() to use new MetricsLogger API"

7 years agoMove static search ranking from DatabaseResultLoader to Search Adapter.
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

7 years agoMerge "Fix a flaky test."
Fan Zhang [Fri, 26 May 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Fix a flaky test."

7 years agoMerge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3
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

7 years agoMerge "Allow some system channels to be blocked" into oc-dev
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

7 years agoMerge "Allow some system channels to be blocked" into oc-dev
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system channels to be blocked" into oc-dev

7 years agoMerge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev am: 136a3da4a3
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

7 years agoMerge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
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

7 years agoMerge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34
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

7 years agoMerge "Sort app list after smeared on screen" into oc-dev am: f68bb7e75c
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

7 years agoMerge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev

7 years agoMerge "Show setting for work profile lock screen notification" 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

7 years agoMerge "Sort app list after smeared on screen" into oc-dev
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

7 years agoMerge "Show setting for work profile lock screen notification" into oc-dev
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

7 years agoMerge "Sort app list after smeared on screen" 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

7 years agoFix a flaky test.
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

7 years agoMerge "Add logging to default browser preference controller"
TreeHugger Robot [Thu, 25 May 2017 21:27:22 +0000 (21:27 +0000)]
Merge "Add logging to default browser preference controller"

7 years agoFix an override filter bug.
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

7 years agoUpdate logPackageName() to use new MetricsLogger API
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

7 years agoMerge "Show setting for work profile lock screen notification"
TreeHugger Robot [Thu, 25 May 2017 20:37:48 +0000 (20:37 +0000)]
Merge "Show setting for work profile lock screen notification"

7 years agoMerge "Update notification settings to match Notification Dot branding." into oc...
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

7 years agoMerge "Add NPE check for refreshUi" into oc-dev am: 1a8c2dd899
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

7 years agoReduce flakiess in account preference controller test.
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

7 years agoMerge "Update notification settings to match Notification Dot branding." into oc-dev
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

7 years agoMerge "Add NPE check for refreshUi" into oc-dev
Lei Yu [Thu, 25 May 2017 20:07:20 +0000 (20:07 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
am: 1a8c2dd899

Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028

7 years agoMerge "Update notification settings to match Notification Dot branding." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 20:06:27 +0000 (20:06 +0000)]
Merge "Update notification settings to match Notification Dot branding." into oc-dev

7 years agoMerge "Add NPE check for refreshUi" into oc-dev
Lei Yu [Thu, 25 May 2017 19:51:13 +0000 (19:51 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev

7 years agoMerge "Add setIconContentDescription to EntityHeaderController"
TreeHugger Robot [Thu, 25 May 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Add setIconContentDescription to EntityHeaderController"

7 years agoAdd logging to default browser preference controller
Fan Zhang [Thu, 25 May 2017 19:22:21 +0000 (12:22 -0700)]
Add logging to default browser preference controller

Bug: 38480521
Test: manual
Change-Id: I1b0d389f0aa6cc4c9d1895e4cae4d0561df0f0ca

7 years agoShow setting for work profile lock screen notification
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
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

7 years agoShow setting for work profile lock screen notification
Fan Zhang [Thu, 25 May 2017 00:24:06 +0000 (17:24 -0700)]
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

7 years agoAllow some system channels to be blocked
Julia Reynolds [Wed, 24 May 2017 20:20:06 +0000 (16:20 -0400)]
Allow some system channels to be blocked

Test: manual
Bug: 38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0

7 years agoSupport find sensor screen with no animation
Maurice Lam [Mon, 22 May 2017 18:19:26 +0000 (11:19 -0700)]
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

7 years agoSort app list after smeared on screen
jackqdyulei [Tue, 23 May 2017 22:08:24 +0000 (15:08 -0700)]
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

7 years agoMerge "Add metrics category for the assist gesture settings."
Philip Quinn [Thu, 25 May 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Add metrics category for the assist gesture settings."

7 years agoUpdate notification settings to match Notification Dot branding.
Alison Cichowlas [Wed, 24 May 2017 17:15:27 +0000 (13:15 -0400)]
Update notification settings to match Notification Dot branding.

Bug: 38387970
Test: string changes only, manually verified

Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b

7 years agoMerge "Make failed ConfirmCredential attempts count towards wipe"
Charles He [Thu, 25 May 2017 12:35:42 +0000 (12:35 +0000)]
Merge "Make failed ConfirmCredential attempts count towards wipe"

7 years agoMerge "Add icons to choose lock dialog"
TreeHugger Robot [Thu, 25 May 2017 04:43:26 +0000 (04:43 +0000)]
Merge "Add icons to choose lock dialog"

7 years agoMerge "Turn on power accounting in AOSP" into oc-dev am: 0a6d61883c
jackqdyulei [Thu, 25 May 2017 04:04:47 +0000 (04:04 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev am: 0a6d61883c
am: db42779cf1

Change-Id: Ie4db806a166c45a14cd3b8ed69be6405befcb64b

7 years agoMerge "Turn on power accounting in AOSP" into oc-dev
jackqdyulei [Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
am: 0a6d61883c

Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea

7 years agoMerge "Turn on power accounting in AOSP" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev

7 years agoMerge "Recursively remove preference from screen." into oc-dev am: 7731b4244e
Fan Zhang [Thu, 25 May 2017 03:28:15 +0000 (03:28 +0000)]
Merge "Recursively remove preference from screen." into oc-dev am: 7731b4244e
am: 4472d8af83

Change-Id: Ie8835c9789d959ce3d75b84b05d711f976bab56e

7 years agoMerge "Recursively remove preference from screen." into oc-dev
Fan Zhang [Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
am: 7731b4244e

Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c

7 years agoMerge "Recursively remove preference from screen." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev

7 years agoMerge "Listener to tether state change on Network & internet page." into oc-dev am...
Doris Ling [Thu, 25 May 2017 02:37:59 +0000 (02:37 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890
am: be520a5f34

Change-Id: I31036a30605036e957b421727833b3a9830e4584

7 years agoMerge "Listener to tether state change on Network & internet page." into oc-dev
Doris Ling [Thu, 25 May 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
am: 1dead24890

Change-Id: Ic64e4f29c2e7124b3e977acb245f0e3e15f84ff6

7 years agoMerge "Listener to tether state change on Network & internet page." into oc-dev
TreeHugger Robot [Thu, 25 May 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev

7 years agoMerge "Sort app list after smeared on screen"
TreeHugger Robot [Thu, 25 May 2017 02:25:39 +0000 (02:25 +0000)]
Merge "Sort app list after smeared on screen"

7 years agoMerge "Migrate settings robolectric tests to mockito 2"
TreeHugger Robot [Thu, 25 May 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Migrate settings robolectric tests to mockito 2"

7 years agoMerge "Set correct uid when loading app icon in data usage UI."
TreeHugger Robot [Thu, 25 May 2017 02:13:13 +0000 (02:13 +0000)]
Merge "Set correct uid when loading app icon in data usage UI."

7 years agoMerge "Add a flag for the Bluetooth device details page"
TreeHugger Robot [Thu, 25 May 2017 02:10:34 +0000 (02:10 +0000)]
Merge "Add a flag for the Bluetooth device details page"

7 years agoMerge "UI Cleanup on supported links dialog in app info page."
TreeHugger Robot [Thu, 25 May 2017 02:04:34 +0000 (02:04 +0000)]
Merge "UI Cleanup on supported links dialog in app info page."

7 years agoAdd icons to choose lock dialog
Maurice Lam [Fri, 19 May 2017 22:23:26 +0000 (15:23 -0700)]
Add icons to choose lock dialog

- Add icons to items in choose lock dialog
- Add title to the dialog
- Update the font size and color to match specs

Test: Manual. Existing tests pass
Bug: 38394440
Change-Id: Ie7ed9944b71fa5ca408ec6898f49cbd36865a1dd