Commit Graph

46722 Commits

Author SHA1 Message Date
richard chou
baadcabd04 Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev
am: 034e39679d

Change-Id: I79ba64918f591c28067b10a09c3844824f7a9278
2018-05-15 11:57:59 -07:00
Rajeev Kumar
1378ebfcca Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev
am: e3813863b7

Change-Id: Iba013ff7a6983b7544b5194ff3480f1b1aa28025
2018-05-15 11:42:07 -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
034e39679d Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev 2018-05-15 18:16:25 +00:00
Jeff Gaston
77122cf150 Merge "Update for support library prebuilt drop" into pi-dev
am: 72f57a7c99

Change-Id: I4256831e69c3a61ce18a22afcec0cec845da2e93
2018-05-15 11:16:02 -07:00
TreeHugger Robot
e3813863b7 Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev 2018-05-15 18:07:56 +00:00
richard chou
4eb9e542c1 Suppress NewDeviceIntroSuggestionActivity if Tips application exists
NewDeviceIntroSuggestionActivity should not show if Tips application exists.

Bug: 77652536
Test: atest SettingsRoboTests
Change-Id: I0aa19a5bc79c8b1497f42372d293299509d897b2
Merged-In: I85575e8eb92a8a620f0af9e5ad3ebd5b8dd05323
2018-05-15 17:17:21 +00:00
TreeHugger Robot
5229b7c549 Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" 2018-05-15 17:16:35 +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
Jeff Gaston
72f57a7c99 Merge "Update for support library prebuilt drop" into pi-dev 2018-05-15 16:37:55 +00:00
Jeff Gaston
3e76e17c15 Update for support library prebuilt drop
Bug: 79267345
Test: m -j checkbuild

Change-Id: I086a2253a1c94af6f7c4dca04d2644a4f9e54ef5
2018-05-15 11:21:26 -04:00
Matthew Fritze
55e85694af Merge "Remove old meta data declarations in manifest" into pi-dev am: 9b7f0e4c5d
am: 94f84da552

Change-Id: Ic78f181b03c0ae32fd09f4970c58ce7e0ba03887
2018-05-15 06:56:48 -07:00
Matthew Fritze
94f84da552 Merge "Remove old meta data declarations in manifest" into pi-dev
am: 9b7f0e4c5d

Change-Id: I5c28d032d6ca39be4ec9a239ff0637d3806ae74f
2018-05-15 06:52:41 -07:00
TreeHugger Robot
9b7f0e4c5d Merge "Remove old meta data declarations in manifest" into pi-dev 2018-05-15 13:45:32 +00:00
Jason Monk
70fd54b770 Merge "Delay index job a little bit" into pi-dev am: 5530329da2
am: 2d462ea467

Change-Id: I40bd038c46ed428096d8b6e17ba0326d2e98c827
2018-05-15 06:25:26 -07: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
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