Commit Graph

1171 Commits

Author SHA1 Message Date
Matthew Fritze
979aa9e1bb Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev am: b48e6e46b3
am: 6e4d02fa86

Change-Id: I2a35e242e6430fe7f68eb10d5a96177898d29933
2017-04-27 20:01:56 +00:00
TreeHugger Robot
b48e6e46b3 Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev 2017-04-27 19:50:31 +00:00
Maurice Lam
ddbbe46333 Fix Robolectric test on oc-dev. DO NOT MERGE am: 8352421baa
am: 9e7debc8a3

Change-Id: Ia75a0fe1332a9c0a7e8a90117a9c1fbb3b713a6c
2017-04-27 19:44:39 +00:00
Matthew Fritze
2caaa7420d Remove search duplicates for Wifi and Bluetooth
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
2017-04-27 12:36:16 -07:00
Maurice Lam
8352421baa Fix Robolectric test on oc-dev. DO NOT MERGE
The directories for setup wizard lib renamed on master.

Test: cd tests/robotests && mma
Bug: 37745541
Change-Id: Iffb7aa85a41a1d84c17357144f964e1d6da693be
2017-04-27 12:01:57 -07:00
Doris Ling
2e4ff90f5a Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Change-Id: I611ec77174ab45315ccbee2952bdbc2c9a9cd954
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-27 10:52:31 -07:00
TreeHugger Robot
32d3d383cb Merge "Don't show autofill settings if not enabled" into oc-dev 2017-04-27 16:43:21 +00:00
TreeHugger Robot
6e34174f72 Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev 2017-04-27 16:23:06 +00:00
Philip P. Moltmann
d984e90b63 Don't show autofill settings if not enabled
The non-indexable keys of language-and-input on my angler are:
  game_controller_settings_category, gesture_assist,
  gesture_double_tap_screen, default_autofill

Fixes: 35956220
Test: Disabled auto-fill and looked at settings: did not find
      autofill button and could not find auto-fill in search
      Settings robolectric test
Merged-In: I0923e707422d1b1de5153a63fa3a5fe4773c055d
Change-Id: I0923e707422d1b1de5153a63fa3a5fe4773c055d
2017-04-27 15:10:02 +00:00
Denis Kuznetsov
3de32ae4dc DO Disclosures: detailed application lists
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).

Bug: 32692748
Test: m RunSettingsRoboTests
Merged-In: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
Change-Id: I7d0041e4fada48bc56f6a6637614ac4471dba65a
(cherry picked from commit f0a61dd112)
2017-04-27 13:29:13 +02:00
Denis Kuznetsov
7db69b7a26 DO Disclosure: add UI that lists apps that were managed by owner:
- had permissions granted by admin
- were installed by owner via policy

Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
Merged-In: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
(cherry picked from commit 60b2960cbb)
2017-04-27 13:28:55 +02:00
Pavel Grafov
f9f980d315 Disable "Verify apps over usb" according to user restriction.
Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
Merged-In: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-27 11:51:00 +01:00
TreeHugger Robot
3d3925f565 Merge "Don't show autofill settings if not enabled" 2017-04-27 06:55:58 +00:00
Fan Zhang
334e1957e0 Merge "Resolve intent before launching from DashboardFragment." into oc-dev am: c028a7d976
am: 09a840ebab

Change-Id: Id67a9415b0fdbf585bdb8d0533775a5e56995341
2017-04-27 06:04:53 +00:00
TreeHugger Robot
c028a7d976 Merge "Resolve intent before launching from DashboardFragment." into oc-dev 2017-04-27 05:47:30 +00:00
Philip P. Moltmann
4619ae0652 Don't show autofill settings if not enabled
The non-indexable keys of language-and-input on my angler are:
  game_controller_settings_category, gesture_assist,
  gesture_double_tap_screen, default_autofill

Fixes: 35956220
Test: Disabled auto-fill and looked at settings: did not find
      autofill button and could not find auto-fill in search
      Settings robolectric test
Change-Id: I0923e707422d1b1de5153a63fa3a5fe4773c055d
2017-04-26 22:29:28 -07:00
Maurice Lam
75215a9553 Merge "Enable redaction interstitial after setting up pattern" into oc-dev am: 2fc1fa6c41
am: 0c3e38b593

Change-Id: Ibfd4234138aed95c50a32ce9120c8cf09df4d5ff
2017-04-27 04:01:07 +00:00
TreeHugger Robot
2fc1fa6c41 Merge "Enable redaction interstitial after setting up pattern" into oc-dev 2017-04-27 03:40:18 +00:00
TreeHugger Robot
086f2dfe3e Merge "Disable "Verify apps over usb" according to user restriction." 2017-04-27 03:37:27 +00:00
Doris Ling
3248492fd7 Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d
am: 387b8c0f8e

Change-Id: I6f38e2100fbbfa30df6e3719cb66062573e54556
2017-04-27 03:31:07 +00:00
TreeHugger Robot
024bc8706d Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev 2017-04-27 03:22:21 +00:00
Jack He
6ad51a2d10 Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev am: fdd8d3f6ae
am: a16bcf17d4

Change-Id: I7e8341383751e04f12f163bbe56eb90376ef491b
2017-04-27 00:40:57 +00:00
TreeHugger Robot
fdd8d3f6ae Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev 2017-04-27 00:32:12 +00:00
TreeHugger Robot
6fd02de9b2 Merge "Update UI for Wifi Direct settings" 2017-04-27 00:30:07 +00:00
Fan Zhang
022ef86f1a Update UI for Wifi Direct settings
- Change the launching preference from using an intent to directly a
fragemnt
- Partially convert WifiP2pSettings to a DashboardFragment
- Add a controller to control each pref category, when they have no
child, hide.
- Add a controller to control device's own AP name.

Change-Id: I23685c4d4a85f80ceab5a576005e693e6f8b7cc4
Fix: 36859626
Test: make RunSettingsRoboTests
2017-04-26 15:54:07 -07:00
Fan Zhang
3c7ca105df Resolve intent before launching from DashboardFragment.
Once dashboard tile is displayed, the underlying intent can be disabled.
We will eventually hide the item from UI, but there can be a brief
moment before we are able to hide it. So to prevent user click and
launch a non-exist intent, we will try to resolve it first before
launching anything.

Change-Id: Ic8d790bf3c5d4d269eadb757f789a1641928a7b7
Fix: 36036097
Test: make RunSettingsRoboTests
2017-04-26 14:44:12 -07:00
Doris Ling
cf4a185aeb DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
This reverts commit 03ee253701.

The change does not work properly and is causing confusion.

Bug: 36650108

Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
Maurice Lam
c7e0fd90fb Enable redaction interstitial after setting up pattern
Test: cd tests/robotests && mma
Bug: 37514884
Change-Id: Ie9342ca0ea893a687284d8b864c6d53a79f88086
2017-04-26 17:54:55 +00:00
Fan Zhang
61183bfa45 Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev am: f650c82b16
am: 07309c8f2a

Change-Id: I2b37d576000d9204c960d01da21a9df04006ea59
2017-04-26 17:07:07 +00:00
Daniel Nishi
f9a073bb69 Merge "Don't shows Files when storage is adopted." into oc-dev am: 980155fb30
am: 23f6fcf90a

Change-Id: I8449865c72091f6a6752bebc17d14848e17e2776
2017-04-26 17:06:32 +00:00
jackqdyulei
6a9e198851 Merge "Distribute the misc among all the apps" into oc-dev am: e494a3e59b
am: 0fbccaa30b

Change-Id: I901cff477dd1ad86a90a096a99346a745696854c
2017-04-26 10:56:15 +00:00
jackqdyulei
89f27bcc2d Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad
am: 303672f1d3

Change-Id: I70f8b843f79ddac4a4dd80834a09846296e33667
2017-04-26 10:55:55 +00:00
Fan Zhang
2e02794115 Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
am: 7d04b2dab0

Change-Id: Ieece29f0f8488a9932aa96be6958430337df8d4e
2017-04-26 10:55:34 +00:00
Ruchi Kandoi
068ba85a7e Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev am: 41a858fde1
am: 7094f1d170

Change-Id: Idde8d3b3782d8a6d111a9314a6a458ec650405e0
2017-04-26 10:55:10 +00:00
Pavel Grafov
5d567c4786 Disable "Verify apps over usb" according to user restriction.
This is ag/2124876 which fails to automerge oc-dev->master, so
sending as a separate change. Will add Merged-In to the original CL
before submitting to oc-dev.

Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-26 11:54:13 +01:00
TreeHugger Robot
f650c82b16 Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev 2017-04-26 00:06:42 +00:00
Fan Zhang
0576ea48b5 resolve merge conflicts of e8411c4454 to master
Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
2017-04-25 16:16:12 -07:00
Daniel Nishi
980155fb30 Merge "Don't shows Files when storage is adopted." into oc-dev 2017-04-25 22:30:29 +00:00
Fan Zhang
bd3cbf44ac Merge "Update account sync settings title." into oc-dev am: a031636725
am: c669438450

Change-Id: I5a163d5e3902c04f1006a15e4a330f55f6af0ef9
2017-04-25 22:19:10 +00:00
jackqdyulei
bf922da309 Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev am: e5fa4cd4b5
am: 1bc54ae5eb

Change-Id: I065332475ad70ef81367e37b608e1c18f358d6d6
2017-04-25 22:18:50 +00:00
TreeHugger Robot
e494a3e59b Merge "Distribute the misc among all the apps" into oc-dev 2017-04-25 21:44:55 +00:00
TreeHugger Robot
d0ea1386ad Merge "Move battery stats loading to AsyncLoader." into oc-dev 2017-04-25 21:44:06 +00:00
Jack He
2a67cf0465 Bluetooth: Dismiss pairing dialog on user click
* Existing pairing dialog should be dismissed when user clicks on Yes/No
* In a pairing session with multiple pairing dialogs, this is necessary
  as otherwise the second pairing dialog will not be shown
* Modified unit test to test this behavior
* Launch pairing dialog as UserHandle.CURRENT to avoid Context warnings

Bug: 35833536
Test: make, unit test, pair with Bluetooth devices
Change-Id: I1823b78d287134505f59eab7caca2329ecc3a36f
2017-04-25 14:13:26 -07:00
Daniel Sheng
e531c540c2 Merge "Added settings UI for camera lift trigger gesture" 2017-04-25 20:43:55 +00:00
jackqdyulei
106dc459e0 Move battery stats loading to AsyncLoader.
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.

This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.

Following cl will add animation for the battery header to make it not
so janky

Bug: 37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
2017-04-25 13:26:17 -07:00
TreeHugger Robot
eda3e8c3d9 Merge changes I4ae01109,Ib45289c3 into oc-dev
* changes:
  Remove shadow below app info header.
  Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Fan Zhang
a25bc6983e Add search index provider for ConfigureNotificationSettings
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix: 37593839
Test: make RunSettingsRoboTests
2017-04-25 13:01:36 -07:00
TreeHugger Robot
41a858fde1 Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev 2017-04-25 19:05:42 +00:00
Fan Zhang
db68ddc1cc Merge "Properly check wallpaper state before showing suggestion" into oc-dev 2017-04-25 18:55:53 +00:00
Fan Zhang
a031636725 Merge "Update account sync settings title." into oc-dev 2017-04-25 18:55:29 +00:00