Commit Graph

47034 Commits

Author SHA1 Message Date
TreeHugger Robot
e0e8d122fa Merge "Add action log in "Restrict app page"." 2018-05-22 00:34:35 +00:00
Antony Sargent
32acddc83e Update music, notifications, device information, and movies icons
Also delete duplicated ic_settings_notifications.xml and point existing
usages to ic_notifications.xml

Bug: 77982107
Test: manual
Change-Id: Ia7896598c6334aa97faf392b17e6bc3c17d58599
2018-05-21 16:58:38 -07:00
TreeHugger Robot
b084c97ef7 Merge "Misc GAR fixes" 2018-05-21 23:40:29 +00:00
Android Build Merger (Role)
6351f90219 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
Change-Id: I89bf7eb803969f28afc67c2c2073b6169131c3fe
2018-05-21 22:49:17 +00:00
Lei Yu
38ea79d024 Add action log in "Restrict app page".
This CL adds confirmation dialog in "Restrict app page". By go through
BatteryTipDialogFragment, it will find the correct action, in which
we already have log:
1. RestrictAppAction
2. UnRestrictAppAction

Bug: 79992590
Test: RunSettingsRoboTests
Change-Id: I179fbd17a012528fdfacf42e4a93943eaefff23d
2018-05-21 15:42:08 -07:00
Matthew Fritze
f59a77ca23 Fix availability status for AOD gestures
Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.

Test: robotests
Change-Id: Ib246070ee853185459628b2584ddbae72e15a2f8
2018-05-21 15:41:39 -07:00
Fan Zhang
3ab53bbd7b Misc GAR fixes
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
2018-05-21 22:38:24 +00:00
Fan Zhang
71c402b152 Misc GAR fixes
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
2018-05-21 15:37:43 -07:00
TreeHugger Robot
14bf352f5e Merge "styleActionBar when updating header" 2018-05-21 22:18:57 +00:00
TreeHugger Robot
f703d1cb3b Merge "Set click listeners on displayPreference" 2018-05-21 22:18:53 +00:00
Antony Sargent
732b65ca4d Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
2018-05-21 15:14:25 -07:00
Matthew Fritze
46f40517be Fix availability status for AOD gestures
Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.

Test: robotests
Change-Id: Ib3f40c38bb210d0f512736746dc45a1b844c6bee
Merged-In: Ib246070ee853185459628b2584ddbae72e15a2f8
Fixes: 79779562
2018-05-21 15:13:20 -07:00
Android Build Merger (Role)
108cb3edaa [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
2018-05-21 22:05:41 +00:00
Matthew Fritze
a7aab5d7a2 Merge "Change Night Display slice title to "NightDisplay"" into pi-dev am: fbe8e0f11e
am: 29365aa2e7

Change-Id: Ifbe37d928fa60f560adbb971a07bb699b9777bab
2018-05-21 14:49:39 -07:00
Matthew Fritze
29365aa2e7 Merge "Change Night Display slice title to "NightDisplay"" into pi-dev
am: fbe8e0f11e

Change-Id: I5e5659e629761631aaaa81e2f5e84a048339acee
2018-05-21 14:47:19 -07:00
Antony Sargent
a0b8f3fe3a Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I049138002f07e78442ddebfa746d6128b5689947
2018-05-21 14:43:18 -07:00
TreeHugger Robot
fbe8e0f11e Merge "Change Night Display slice title to "NightDisplay"" into pi-dev 2018-05-21 21:37:38 +00:00
Beverly
b9659d352c [automerger skipped] DO NOT MERGE styleActionBar when updating header am: 77b5986032
am: 0e35a49546  -s ours

Change-Id: I3d2a8a59965ab4f06f5d0303f7c3bda71af90907
2018-05-21 14:08:57 -07:00
Beverly
0e35a49546 DO NOT MERGE styleActionBar when updating header
am: 77b5986032

Change-Id: Ibe961b91bdefe789e83015f3111aaaf6b8986ee0
2018-05-21 14:00:52 -07:00
Android Build Merger (Role)
81573c9301 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
Change-Id: I9d42278f5f9dae38dacf16012b242c6dd9b5abb2
2018-05-21 21:00:05 +00:00
Android Build Merger (Role)
c874b450af [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
Change-Id: Iacafdefee68a900d636db83ccbf764114327a805
2018-05-21 21:00:04 +00:00
Android Build Merger (Role)
e9345782e2 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e
2018-05-21 21:00:03 +00:00
Android Build Merger (Role)
7304aaf293 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
2018-05-21 21:00:01 +00:00
Android Build Merger (Role)
ed423eadcf [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d
2018-05-21 20:59:52 +00:00
Beverly
454673acca styleActionBar when updating header
Cherry-picked from pi-dev
If the activity has started, style the actionBar when the
header is being updated

Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Fixes: 79983080
2018-05-21 16:55:27 -04:00
Matthew Fritze
6394a1425c Change Night Display slice title to "NightDisplay"
Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
2018-05-21 20:52:15 +00:00
Beverly
77b5986032 DO NOT MERGE styleActionBar when updating header
If the activity has started, style the actionBar when the
header is being updated

Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Bug: 79983080
2018-05-21 20:30:22 +00:00
TreeHugger Robot
df5a331270 Merge "Dynamically showing "driving mode"" 2018-05-21 17:38:18 +00:00
Beverly
14a6856d37 Set click listeners on displayPreference
Cherry-picked from pi-dev
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Fixes: 79728671
2018-05-21 11:19:13 -04:00
Beverly
6702e49734 Merge "Don't give onboarding dialog a fixed width" into pi-dev am: c4929ccc19
am: cacd84c669

Change-Id: I83391213e8382269190dbb83ff5d405616db5c17
2018-05-21 07:48:41 -07:00
Beverly
cacd84c669 Merge "Don't give onboarding dialog a fixed width" into pi-dev
am: c4929ccc19

Change-Id: Id3a296b4daad2dd2353ae31a3a91bea720a1ec47
2018-05-21 07:36:41 -07:00
TreeHugger Robot
c4929ccc19 Merge "Don't give onboarding dialog a fixed width" into pi-dev 2018-05-21 14:20:12 +00:00
Beverly Tai
b6443af9ae Merge "Update DND strings" into pi-dev am: c5ac30d1c7
am: a1397786fb

Change-Id: I4b16109b29be4f88a7bb424ce28ede8c562e3cae
2018-05-21 07:03:52 -07:00
Beverly Tai
a1397786fb Merge "Update DND strings" into pi-dev
am: c5ac30d1c7

Change-Id: Iec145e7fb343812dba25fccdb9b4ca48aa67641e
2018-05-21 06:59:21 -07:00
Beverly Tai
c5ac30d1c7 Merge "Update DND strings" into pi-dev 2018-05-21 13:51:10 +00:00
timhypeng
444d490e7f Make device discoverable in Connected Devices settings page
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4042235 in
  master and fix TreeHugger error. Change android.support.v7.* to androidx.*
* Set preference title by bluetooth state
* Enable bluetooth discoverable mode in Connected device page
* Add more test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
2018-05-21 10:42:36 +00:00
timhypeng
dd2d5c192f Add bluetooth discoverable footer preference in connected devices page
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4042014 in
  master and fix TreeHugger error. Change android.support.v7.* to androidx.*
* Dynamicly add preference in controller
* Add test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
2018-05-21 10:41:54 +00:00
TreeHugger Robot
5e26004d38 Merge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors." 2018-05-21 10:23:17 +00:00
ryanywlin
1bc4284443 Move getLocalBtManager into FutureTask am: 988dc9fbe6
am: 7afd2e57a7

Change-Id: I7860a19b42b65844ec2a0fc8cf6c8b82d05fd4c6
2018-05-21 03:09:29 -07:00
ryanywlin
7afd2e57a7 Move getLocalBtManager into FutureTask
am: 988dc9fbe6

Change-Id: Ifc3131dd15094c2eef4cbab05df46070b41928d0
2018-05-21 03:04:46 -07:00
Jason Chang
a76797e756 [SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors.
Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors and change every callers entry.

Bug: 78215054
Test: manually test for UI
Change-Id: Ie201aee439bd9e8337eca989b4cdc836a6e8e917
2018-05-21 17:23:41 +08:00
hughchen
29c96ed090 Dynamically showing "driving mode"
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4062037 in
  master and fix TreeHugger "Automatic merge failed" error
* Dynamically showing "driving mode" in "Connection preferences" summary.
  In cl/196700988, when driving mode is available/not available will using Settings.System to set flag.
  Example :
  driving mode is available : Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1)
  driving mode is not available : Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 0);

  This CL using Settings.System to get driving mode state that used to dynamically showing "driving mode"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I702fa4fbc752c7b470184cf58f2e604f9f28c057
2018-05-21 16:30:46 +08:00
ryanywlin
988dc9fbe6 Move getLocalBtManager into FutureTask
Utils.getLocalBtManager in constructor violate StrictMode
ThreadPolicy, move it into FutureTask.

Bug: 79985175
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I0a14be18e4766245e7d165239d47ab54fa5e4acb
2018-05-21 07:30:40 +00:00
hughchen
5a8b5dd431 Using static method to get summary resource id am: 7f1345c3cd
am: 6a4174a079

Change-Id: I91b805e89e9f3d5a3259f10401a9963d25cb32e1
2018-05-21 00:12:18 -07:00
hughchen
6a4174a079 Using static method to get summary resource id
am: 7f1345c3cd

Change-Id: I4acae01207e56a779d5f854e618127311b8408a4
2018-05-21 00:07:39 -07:00
hughchen
7f1345c3cd Using static method to get summary resource id
* Using getConnectedDevicesSummaryResourceId() to get the resource id to shown the summary.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I268de4d989fe01eff463a5ec1c0a174e094e56c0
2018-05-21 04:08:46 +00:00
Bill Yi
6a23d41ddb [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 36029724b2 -s ours
am: 0c5ae7efd7  -s ours

Change-Id: I66dc039a91ee4b84c146390e5bcf7c2b7c6d1423
2018-05-20 07:10:48 -07:00
Bill Yi
0c5ae7efd7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 36029724b2  -s ours

Change-Id: I919f8e980c6522783d2dbb8fbb94d84fba50dc9b
2018-05-20 07:05:48 -07:00
TreeHugger Robot
36029724b2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-05-20 14:00:12 +00:00
Bill Yi
68dfe44ce4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8c15eb852603c17a804d652c236ee561a4218b22
2018-05-20 02:34:03 -07:00