Commit Graph

45841 Commits

Author SHA1 Message Date
Beverly
88516c0d89 Merge "Gets rid of dividers in sound settings" into pi-dev am: e6f66a3c9a
am: e385ab21a3

Change-Id: Ic49618490e07f940b4caafa418eb160aa676ad91
2018-05-15 06:24:36 -07:00
Jason Monk
2d462ea467 Merge "Delay index job a little bit" into pi-dev
am: 5530329da2

Change-Id: Ifd278179f6c5527bdd19dcc656459525ac403cd1
2018-05-15 06:21:25 -07:00
Beverly
e385ab21a3 Merge "Gets rid of dividers in sound settings" into pi-dev
am: e6f66a3c9a

Change-Id: Iaaa2ea0ba1f37b1c477a18000e49724b5162288a
2018-05-15 06:20:34 -07:00
TreeHugger Robot
5530329da2 Merge "Delay index job a little bit" into pi-dev 2018-05-15 13:18:42 +00:00
TreeHugger Robot
e6f66a3c9a Merge "Gets rid of dividers in sound settings" into pi-dev 2018-05-15 13:16:22 +00:00
Irina Dumitrescu
efdfbeaff4 Credential storage triggers unlock when keystore is locked.
If the phone is in the unlocked state and keystore is locked, storing
credentials asks for a password that does not exist to the user. Replace
this workflow with a key guard confirmation, asking the user to unlock
the screen in the same way they would normally unlock their phone.

Bug: 68298609
Test: adb push sample_credentials.p12 /sdcard/
Test: adb shell su 1000 service call android.security.keystore 9 i32 0
Test: adb shell am start -a android.credentials.INSTALL --user 10
Test: adb shell su 1000 service call android.security.keystore 9 i32 10

Change-Id: I8a3068a5d7de508fb417016acdf41b1712a2e7cc
2018-05-15 10:16:41 +00:00
hughchen
1b2b83968e Add and update string
* Change the string from "cast" to "driving mode"
* Add string "Bluetooth, NFC" and "Bluetooth"

Bug: 79299421
Test: build pass
Change-Id: I6da7e54545f209110fca8e7a107f3b20066c7623
2018-05-15 15:24:17 +08:00
richard chou
8d72af579e Suppress NewDeviceIntroSuggestionActivity if Tips application exists
NewDeviceIntroSuggestionActivity should not show if Tips application exists.

Bug: 77652536
Test: atest RunSettingsRoboTests
Change-Id: I85575e8eb92a8a620f0af9e5ad3ebd5b8dd05323
2018-05-15 15:18:53 +08:00
timhypeng
8e060b42dd [automerger skipped] Click left side of list in "previously connected devices" should connect to the device am: bafae44cb2
am: 5248e0cfd9  -s ours

Change-Id: I0c77dc238b4dfe777e5928d3cbb109a192fdfa6d
2018-05-14 23:20:52 -07:00
timhypeng
5248e0cfd9 Click left side of list in "previously connected devices" should connect to the device
am: bafae44cb2

Change-Id: I8663afa58fe1cb5210575c8966e7430885d19f49
2018-05-14 23:15:50 -07:00
timhypeng
bafae44cb2 Click left side of list in "previously connected devices" should connect to the device
* In "previously connected devices", to connect device
* In "Available media devices", to activate device

Bug: 77607104
Test: make -j50 RunSettingsRoboTests
Change-Id: If5005031bd3f5dc4950abf2c77575785cd6f67b1
Merged-In: If5005031bd3f5dc4950abf2c77575785cd6f67b1
2018-05-15 06:07:28 +00:00
Yanting_Yang
db435e256d Migrate UnrestrictedDataAccess to DashboardFragment
- UnrestrictedDataAccessPreferenceController

Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.datausage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=CodeInspectionTest
      atest UniquePreferenceTest

Change-Id: I71abd837ef51e4e9e0a2ee46791d704245c9b3ab
2018-05-14 21:18:38 -07:00
joeshih
5d772136e1 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-15 12:03:35 +08:00
Chilun Huang
f4b094d13a Merge "Add index for Hotspot settings page into search" 2018-05-15 03:59:15 +00:00
Lei Yu
ae9a1d15e1 Merge "Add string for disabled FAS toggle." into pi-dev am: cbf68188ff
am: ca5296446d

Change-Id: Ida55ab074d37aebf34718e556d0075404c98e4c0
2018-05-14 20:19:11 -07:00
Lei Yu
ca5296446d Merge "Add string for disabled FAS toggle." into pi-dev
am: cbf68188ff

Change-Id: If82cb65870b876462d9aff7cd5630db8186129cb
2018-05-14 20:15:11 -07:00
TreeHugger Robot
cbf68188ff Merge "Add string for disabled FAS toggle." into pi-dev 2018-05-15 03:09:19 +00:00
Lei Yu
107467550f Merge "Remove the dynamic summary for bt preference." into pi-dev am: 912af577ab
am: bb975a5751

Change-Id: I5a2bc49e143b4bdc7370bc9660796735ae1fb81d
2018-05-14 19:07:19 -07:00
Lei Yu
bb975a5751 Merge "Remove the dynamic summary for bt preference." into pi-dev
am: 912af577ab

Change-Id: I7f14345e55d15e50c3bd16ad234d1f31edd5ffc2
2018-05-14 18:37:21 -07:00
TreeHugger Robot
912af577ab Merge "Remove the dynamic summary for bt preference." into pi-dev 2018-05-15 01:15:18 +00:00
Rajeev Kumar
549a188efe Make sure we do not make UI calls from background thread in DashboardSummary class.
Bug: 79705354
Test: make RunSettingsRoboTests -j40 and manual testing.
Change-Id: I08a08e05f3424f4a6d2100aed32d32bb15997c86
2018-05-14 17:59:59 -07:00
Lei Yu
dae3c912d7 Add string for disabled FAS toggle.
If FAS toggle is disabled because app is in doze whitelist(not optimized), show
a dialog that has this string.

Bug: 77924141
Test: Manual
Change-Id: I30518cd887125bff00b7c567e26204d5b1814858
2018-05-14 17:55:21 -07:00
Naina Nalluri
d8f94a72cc [automerger skipped] Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev am: 15602b3f48
am: 86818604ac  -s ours

Change-Id: I0c960ac7c3a9439189fe7d61b2cb9654e84bbe43
2018-05-14 16:18:26 -07:00
Naina Nalluri
86818604ac Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
am: 15602b3f48

Change-Id: I8e8db64e099f0fc06363b1c91c0108285e025e45
2018-05-14 16:12:42 -07:00
Naina Nalluri
15602b3f48 Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev 2018-05-14 22:59:11 +00:00
Lei Yu
7c580997be Merge "Add cancel button for private dns dialog" into pi-dev am: 7fe599f542
am: ea1d9d17d1

Change-Id: I55cab617105d21ff42ed911e6b457ec662349811
2018-05-14 15:11:36 -07:00
Lei Yu
ea1d9d17d1 Merge "Add cancel button for private dns dialog" into pi-dev
am: 7fe599f542

Change-Id: I7a866a68c27503f174b7aa4fa3101264c9174ff5
2018-05-14 14:53:37 -07:00
Lei Yu
b8f2937581 [automerger skipped] Merge "Update the battery broadcast receiver." into pi-dev am: a924a1e2ae
am: 73328b182a  -s ours

Change-Id: I384040dce91b275d466061e93152b60dd99ac7f8
2018-05-14 14:46:35 -07:00
Lei Yu
73328b182a Merge "Update the battery broadcast receiver." into pi-dev
am: a924a1e2ae

Change-Id: I69b4ae6fbdb4baf56b331d8c0fcd0f11a73bbf54
2018-05-14 14:31:45 -07:00
TreeHugger Robot
7fe599f542 Merge "Add cancel button for private dns dialog" into pi-dev 2018-05-14 21:29:09 +00:00
Beverly
07724bdb18 Gets rid of dividers in sound settings
Change-Id: I71a5e37a48cb6366a161ccc6cf456960f1491eec
Fixes:79480349
Test: visual inspection (Settings > Sound)
2018-05-14 17:13:43 -04:00
Matthew Fritze
5eca0c81e6 Remove old meta data declarations in manifest
Change-Id: Ic27b950cc5e640f823074b974f9d29078973fad7
Fixes: 79151692
Test: builds
2018-05-14 14:11:18 -07:00
Lei Yu
80f6aab9b1 Remove the dynamic summary for bt preference.
Starting from b/62069132, we should use static summary for it.

Change-Id: I8ba5a9d6e8b5bcbcd9f4369cdf44004d557257a3
Fixes: 79666649
Test: Manual
2018-05-14 14:09:25 -07:00
Lei Yu
a924a1e2ae Merge "Update the battery broadcast receiver." into pi-dev 2018-05-14 20:45:57 +00:00
Beverly Tai
044213b8ca Merge "Always show custom zen vis eff option" 2018-05-14 20:23:31 +00:00
Naina Nalluri
e6bf71abed DO NOT MERGE Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
  1. If there is no activation needed or if the Wifi calling
     is currently turned on - provide the slice to toggle the
     value
  2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
  1. If the action is turning off wifi or if there is no
     activation needed. Change the setting with ImsManager.
  2. And Ask to requery the slice in one second to display
     updated settings if 1 is valid or display appropriate message

Bug: 63731862
Bug: 78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
2018-05-14 20:16:01 +00:00
Lei Yu
231fe615cc Add cancel button for private dns dialog
Also update the onclick method.

Change-Id: I69e92584e056a4d0a686153315b8df002d91e204
Fixes: 79479021
Test: RunSettingsRoboTests
2018-05-14 13:12:00 -07:00
TreeHugger Robot
3d6d739b0e Merge "Slices feature supports device model." 2018-05-14 20:07:06 +00:00
Lei Yu
6d2aaed8ae Update the battery broadcast receiver.
Add a type for battery receiver, then in callback client know for
which reason it been invoked:
1. battery level change
2. battery saver state change
3. battery plug state change

So in this CL, we won't update battery tip for battery level change,
then battery tip won't be dismissed by itself.

Also note in onResume() we will manually update battery tip. So if
user stay in battery settings page and close the screen, once he opens
it we will still force update everything.

Fixes: 79171742
Test: RunSettingsRoboTests

Change-Id: I997844216fd8267e545d74e0d434de9e338f76a1
Merged-In: I997844216fd8267e545d74e0d434de9e338f76a1
2018-05-14 19:40:50 +00:00
Jeff Gaston
45bb1257de Merge "Update for support library prebuilt drop" 2018-05-14 19:32:28 +00:00
Joshua Mccloskey
a1c13b9ad7 Fixed accessibility bug in choose_lock_pattern_common.xml where title was
not always read

Bug:77675435
Test: Verified that the text-to-speach did read the title 'Draw your
pattern again'

Change-Id: Ib9a6815b8f0901a110ebe99a777cf1092acd1d24
2018-05-14 12:27:20 -07:00
TreeHugger Robot
8b623afc72 Merge "Add DND Settings suggestion" 2018-05-14 19:21:31 +00:00
tmfang
5c467566f1 Slices feature supports device model.
- Migrate DeviceModelPreferenceController to BasePreferenceController
- Because Slice feature enables strict mode,
  we can't do I/O(DeviceInfoUtils.getMsvSuffix) on main thread.

  Using FutureTask to get around the foreground thread restriction.

- Modify test case for new device model controller.

Test: slice uri > content://android.settings.slices/intent/my_device_model
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: Idafc132dfa14138ad5a7edd58e63c4b0f644c994
2018-05-14 12:06:47 -07:00
Beverly
55d6aebcc5 Always show custom zen vis eff option
Cherry-picked from pi-dev ag/4044915
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Fixes: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTes
2018-05-14 19:03:40 +00:00
TreeHugger Robot
b5d4138a81 Merge "Add Slices for WifiCalling" 2018-05-14 18:48:42 +00:00
Jason Monk
d68a164747 Merge "Protect against multiple starts of device index job" into pi-dev am: 15700cb779
am: 679ad8e041

Change-Id: Ie7e29bc63d5f1f2f57d6a55225e14faf85d64b18
2018-05-14 11:48:31 -07:00
Hansong Zhang
4195870b53 [automerger skipped] Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev am: cc31240f28
am: d27f2a4d03  -s ours

Change-Id: I3e8015010828aa0ee394c1e3186ed12b86e36000
2018-05-14 11:47:10 -07:00
Jason Monk
679ad8e041 Merge "Protect against multiple starts of device index job" into pi-dev
am: 15700cb779

Change-Id: If34872eb4ddb4b51f4518834aac92a0ef64f163e
2018-05-14 11:41:29 -07:00
Jason Monk
ee3142cc87 Delay index job a little bit
Make sure it doesn't cause jank while launching settings.

Test: existing
Change-Id: I410315469319b2156495f2d8b296fc164c475cb9
Fixes: 78787416
2018-05-14 14:40:01 -04:00
TreeHugger Robot
15700cb779 Merge "Protect against multiple starts of device index job" into pi-dev 2018-05-14 18:31:42 +00:00