Commit Graph

46794 Commits

Author SHA1 Message Date
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
hjchangliao
2f73a6646f Convert Magnify controller to TogglePrefController
Convert below to TogglePreferenceController:
MagnificationNavbarPreferenceController
(Magnify with Button)
MagnificationGesturesPreferenceController
(Magnify with triple-tap)

The two controllers share the same fragment,
Add static method for set/get state in fragment,
And use them in controllers and fragment.

Change-Id: I2bdbdb36be71e1a3ffb557abc5a6115d48de53cf
Fixes: 67997698
Fixes: 67997726
Test: make RunSettingsRoboTests
2018-05-16 16:05:41 +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
Lei Yu
1254049038 Update method isSmartBatteryEnabled()
Check the config value from framework.

Bug: 79698191
Test: RunSettingsRoboTests
Change-Id: I14424e2a96fb3ef3bb7d0f10218266d53e86370d
2018-05-15 18:24:13 -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
TreeHugger Robot
b976044f57 Merge "Show mute icon in sound settings page" 2018-05-15 23:13:34 +00:00
Beverly
a9ce0e9463 [automerger skipped] Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev am: 69ec1673df
am: 7f53974cbd  -s ours

Change-Id: Icfd2c6328fac65e8a72770dff2d240df7a6e5dae
2018-05-15 15:46:29 -07: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
Beverly
7f53974cbd Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev
am: 69ec1673df

Change-Id: I825f94150e349465d4dd9168ab18d8f03fc9ed73
2018-05-15 14:58:21 -07:00
Beverly
2aa4e12145 Show mute icon in sound settings page
Cherry-picked from pi-dev ag/4057627
- Show mute icon when ringer is muted
- Show vibrate icon when ringer is on vibrate
- Show ringer icon when ringer is on ring

Test: visual inspection
Change-Id: I662e0d4fd33ac2284378c2f558509c93c907fbe3
Fixes: 78330194
2018-05-15 21:54:34 +00:00
TreeHugger Robot
69ec1673df Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev 2018-05-15 21:39:55 +00:00
richard chou
4f893b29c7 [automerger skipped] Merge "Suppress NewDeviceIntroSuggestionActivity if Tips application exists" into pi-dev am: 034e39679d
am: baadcabd04  -s ours

Change-Id: I160dbfe42d56c05ea02ca2a41a8df4f16f7438ec
2018-05-15 13:47:31 -07:00
Beverly
90ebab0650 DO NOT MERGE Show mute icon in sound settings page
- Show mute icon when ringer is muted
- Show vibrate icon when ringer is on vibrate
- Show ringer icon when ringer is on ring

Test: visual inspection
Change-Id: I662e0d4fd33ac2284378c2f558509c93c907fbe3
Bug: 78330194
2018-05-15 20:35:50 +00:00
Jason Monk
284ca4f356 Hook up slice deep links
Device indexing might launch them on occassion.

Test: existing test passes
Test: launch deep link
Change-Id: Ie4d3cef2cc384ca809e74b27638d2c5a1d4d98a2
Fixes: 79435996
2018-05-15 16:23:49 -04:00
Rajeev Kumar
0494ba84c9 Merge "Make sure we do not make UI calls from background thread in DashboardSummary class." into pi-dev am: e3813863b7
am: 1378ebfcca

Change-Id: Ib0f7223226bfe4b5cc95672d1f2efe1b7ce4c009
2018-05-15 13:12:20 -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
Jeff Gaston
d9cdfcdbe8 Merge "Update for support library prebuilt drop" into pi-dev am: 72f57a7c99
am: 77122cf150

Change-Id: I0ba9f459736e597e08dddaa72aff86598082937d
2018-05-15 12:09:33 -07:00
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