Commit Graph

46711 Commits

Author SHA1 Message Date
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
Gilbert Lee
0b4722f088 delete DeviceInfoSettings and activity, pref xml
Fixes: 78653510
Test: Manual

Change-Id: I13379f3f7812ceedffc0e9647db15e6358a3dc17
2018-05-20 16:17:43 +08:00
Chienyuan
c8adeca0f7 [automerger skipped] Add developer options toggle for Bluetooth A2DP hardware offload am: c96606500f
am: 6b66b7e8cd  -s ours

Change-Id: I9f0fcba6943ce72a81d9b9a8ab9fc22acc728e1f
2018-05-19 23:52:57 -07:00
Chienyuan
6b66b7e8cd Add developer options toggle for Bluetooth A2DP hardware offload
am: c96606500f

Change-Id: Ie5519aa3109964e4b3bc734242c72ae50a07101c
2018-05-19 23:41:40 -07:00
Chienyuan
c96606500f Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
Merged-In: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:40:22 -07:00
Chienyuan
ea14ef88ee Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:12:28 -07:00
Salvador Martinez
68e531526c [automerger skipped] Merge "Make user explicitly set security type for tether network" into pi-dev am: 0e721c598e
am: 13f97a29a6  -s ours

Change-Id: I7f160e545d458ce3257379d54c46157158ea7633
2018-05-18 20:32:49 -07:00
Salvador Martinez
13f97a29a6 Merge "Make user explicitly set security type for tether network" into pi-dev
am: 0e721c598e

Change-Id: I60f548f4d813a75f256aaf228c0e58232f376a16
2018-05-18 20:27:51 -07:00
TreeHugger Robot
0e721c598e Merge "Make user explicitly set security type for tether network" into pi-dev 2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
Lei Yu
dc6634fd4a Merge "Refine update process for restrict tip." into pi-dev am: 018548b320
am: 0e0bf4672b

Change-Id: I55e46cc96c6fd6be9e726e08bd3ac00f22ba4c5a
2018-05-18 19:13:57 -07:00
TreeHugger Robot
2835348b72 Merge "Make user explicitly set security type for tether network" 2018-05-19 02:05:20 +00:00
Lei Yu
0e0bf4672b Merge "Refine update process for restrict tip." into pi-dev
am: 018548b320

Change-Id: I947eac4e04f049dda27a306427a9bf70412527fc
2018-05-18 19:02:55 -07:00
TreeHugger Robot
018548b320 Merge "Refine update process for restrict tip." into pi-dev 2018-05-19 01:55:05 +00:00
Shuzhen Wang
d359d7c47e [automerger skipped] Merge "Settings: Add logical camera default switch" into pi-dev am: 871d93a564
am: 94f80c719a  -s ours

Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8
2018-05-18 18:51:13 -07:00
hughchen
fdc33416d6 [automerger skipped] Merge "Add controller to show the summary" into pi-dev am: 863b27270d
am: e5ec69e433  -s ours

Change-Id: I42d0991a22187c1b9782db7af7e836ddd299a2fd
2018-05-18 18:49:44 -07:00
Alexey Kuzmin
cf663511db Add vibration preview
Test: Open vibration intensity settings, tap on any option. The preview
effect of selected intensity should be played back.

Bug: 74504389
Merged-In: Ie22ecb830752edb7a7515a3a6475587e72274e51
Change-Id: Ie22ecb830752edb7a7515a3a6475587e72274e51
2018-05-19 02:48:09 +01:00
Shuzhen Wang
94f80c719a Merge "Settings: Add logical camera default switch" into pi-dev
am: 871d93a564

Change-Id: Id24373caa953f31fae232eb965710cca909ce19d
2018-05-18 18:37:16 -07:00
hughchen
e5ec69e433 Merge "Add controller to show the summary" into pi-dev
am: 863b27270d

Change-Id: I612207108138216ba865cb026b00866ae9f53250
2018-05-18 18:35:44 -07:00
Alexey Kuzmin
96f114ad7e Add vibration preview
Test: Open vibration intensity settings, tap on any option. The preview
effect of selected intensity should be played back.

Bug: 74504389
Merged-In: Ie22ecb830752edb7a7515a3a6475587e72274e51
Change-Id: Ie22ecb830752edb7a7515a3a6475587e72274e51
2018-05-19 02:30:44 +01:00
Antony Sargent
6c196e3227 Merge "Update headset, help, and info icons" into pi-dev am: 88d4356a1f
am: d789f43ea9

Change-Id: I26ad75ad4d88395a25445308318a80cd4e1414b8
2018-05-18 18:30:26 -07:00
Antony Sargent
a6b602e370 Merge "Refresh of "swipe up" gesture animation" into pi-dev am: 5d0efdce7f
am: 1ead1f1665

Change-Id: I481687f0a8b6c65d6dff2a18dbe280230d0cd550
2018-05-18 18:29:41 -07:00
TreeHugger Robot
871d93a564 Merge "Settings: Add logical camera default switch" into pi-dev 2018-05-19 01:27:11 +00:00