Commit Graph

15833 Commits

Author SHA1 Message Date
Beverly
df1614f7f1 Merge "DO NOT MERGE Update zen onboarding" into pi-dev
am: b7b355a1c5

Change-Id: Ia5360d8576f97db9b2eb8db6b3b9dff029811e2b
2018-05-16 06:33:05 -07:00
TreeHugger Robot
b7b355a1c5 Merge "DO NOT MERGE Update zen onboarding" into pi-dev 2018-05-16 13:24:39 +00:00
hughchen
4e0e3c83e8 Change string from "Add device" to "Pair new device"
Change string from "Add device" to "Pair new device"

Bug: 79298886
Test: Build pass
Change-Id: Iac4e251d5fab794f90e98911208f026d62b91659
2018-05-16 19:17:06 +08:00
hughchen
4bf7c3a921 Bluetooth and NFC added back to Connection preferences
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 08:03:00 +00:00
joeshih
a025eb2b35 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: Ib06126324516826411a7d50a2bd8a790bfd477c7
Merged-In: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-16 11:36:45 +08:00
Fan Zhang
5de68ea81a Update sound setting icons am: 37a6a91444
am: c3669d8971

Change-Id: Id6d6393f8fb754dd98f756601ddf97d1a5fabf23
2018-05-15 19:05:04 -07:00
Fan Zhang
c3669d8971 Update sound setting icons
am: 37a6a91444

Change-Id: I81addc754a5fbb17a31d15cc1d001de72a50f15e
2018-05-15 18:35:04 -07:00
Mehdi Alizadeh
7c69ec7cfe Moves Swipe Up overlay from Settings app to android.internal
Bug: 79778025
Test: Robo tests
Change-Id: I0cfe5876c5d15552bd4a8e6a96931056846c880d
2018-05-15 18:11:32 -07:00
Fan Zhang
9648d5799e Merge "Convert Smart Storage to BasePrefController" 2018-05-16 00:21:51 +00:00
Fan Zhang
37a6a91444 Update sound setting icons
- icon for sound setting in Settings homepage
- icon on phone muted condition card
- icon on DND condition card and DND suggestion

Bug: 77982107
Test: visual
Change-Id: I22b5223029d67de0bcb2466a45075835453a2b5f
2018-05-15 15:35:37 -07:00
hughchen
cf48c439b7 Merge "Add and update string" into pi-dev am: ef9b8cda82
am: 5487984da5

Change-Id: I2844fcdf4bf053434d4f5a57e367dfe1a3bf7b97
2018-05-15 12:32:16 -07:00
hughchen
5487984da5 Merge "Add and update string" into pi-dev
am: ef9b8cda82

Change-Id: Ibb97f897a9564a03598c56e5e1514c9b645106ed
2018-05-15 11:28:37 -07:00
TreeHugger Robot
52e7880544 Merge "Migrate UnrestrictedDataAccess to DashboardFragment" 2018-05-15 18:18:19 +00:00
TreeHugger Robot
ef9b8cda82 Merge "Add and update string" into pi-dev 2018-05-15 17:04:10 +00:00
Beverly
e3a66fc16d DO NOT MERGE Update zen onboarding
- Update text
- Update buttons
- Update style

Bug: 79702414
Bug: 78447976
Bug: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
2018-05-15 12:43:55 -04:00
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
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
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
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
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
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
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
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
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
Hansong Zhang
d27f2a4d03 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
am: cc31240f28

Change-Id: I756e4f218f9b593e0329c06fc1663c1833ffa389
2018-05-14 11:28:35 -07:00
TreeHugger Robot
cc31240f28 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev 2018-05-14 18:20:29 +00:00
Beverly
8f52258962 Add DND Settings suggestion
Cherry-picked from pi-dev ag/4019736

Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-14 18:15:29 +00:00
Naina Nalluri
6885d85a7c 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 10:19:15 -07:00
Beverly
65251dd8eb Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev
am: 8e27fc7583

Change-Id: I42fbcfcf6073722656cc9186f83c3fee6bbc2777
2018-05-14 08:38:10 -07:00
TreeHugger Robot
8e27fc7583 Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev 2018-05-14 15:29:12 +00:00
Beverly
f487cb9e0a DO NOT MERGE Always show custom zen vis eff option
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest
2018-05-14 14:39:32 +00:00
Bill Yi
9c5d8fdc5a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ide496214e78fbc4bdbd606ecff720a8cf988daa5
2018-05-12 12:16:11 -07:00