Commit Graph

60708 Commits

Author SHA1 Message Date
TreeHugger Robot
54edae5e54 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev 2020-03-05 19:15:30 +00:00
Bill Yi
7d35be74cb Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" 2020-03-05 18:27:29 +00:00
Bill Yi
09be9fbb17 Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
2020-03-05 09:51:19 -08:00
Automerger Merge Worker
a5a38ee2de Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: a334d7a120 am: f6cb962e31 am: 9f8d9f06f4
Change-Id: I389a4225d33a3c317981cf22ca1fe67b17780f8e
2020-03-05 17:47:07 +00:00
Automerger Merge Worker
7e8e921dbb PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: 43b1a3a5f4 am: a076dbac9f am: 2aac11ca45
Change-Id: I87b47fffe5978b6e863a9b6c70b2367bc45b928a
2020-03-05 17:46:59 +00:00
Automerger Merge Worker
730b299639 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: 85aea667a6 am: fadff25240
Change-Id: If0183dd2cdd78ceb168229b879285f780527c7e2
2020-03-05 17:46:53 +00:00
Automerger Merge Worker
65930df1e2 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64 am: 6993251d18 am: 4a2b5a89ec
Change-Id: I1e84d81031793a994d6ed019908b2695636fbb34
2020-03-05 17:46:46 +00:00
Automerger Merge Worker
0315007d1f PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: ece27868c4 am: 29a7e2f861 am: 856c7a4481
Change-Id: Iced1c51a30cd846271f2a9adcd414de9f3bec558
2020-03-05 17:46:39 +00:00
Automerger Merge Worker
fbc8b3727a PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: ffe0b05d59 am: 5487890d1c
Change-Id: I1760d29d33fd41a44a1c93d30301b717cb78acb9
2020-03-05 17:46:18 +00:00
Automerger Merge Worker
9f8d9f06f4 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: a334d7a120 am: f6cb962e31
Change-Id: Iafc0391b3e2cefd50e3e4075ad0903ab5d4e66c6
2020-03-05 17:46:07 +00:00
Automerger Merge Worker
2aac11ca45 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: 43b1a3a5f4 am: a076dbac9f
Change-Id: I0efdabd4de4dc3f35168823287793d21076ea157
2020-03-05 17:45:30 +00:00
Automerger Merge Worker
fadff25240 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: 85aea667a6
Change-Id: I215f1f51b28e3a8a3e63cc76fdf3f2115087b223
2020-03-05 17:29:29 +00:00
Automerger Merge Worker
4a2b5a89ec Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64 am: 6993251d18
Change-Id: Ib8f57b07781c0becdbf05fb6ccfa9af2d3758634
2020-03-05 17:29:09 +00:00
Automerger Merge Worker
856c7a4481 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: ece27868c4 am: 29a7e2f861
Change-Id: I574ee0bed2909212bda69d01bdaf3df670464188
2020-03-05 17:28:54 +00:00
Automerger Merge Worker
f6cb962e31 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf am: a334d7a120
Change-Id: I284d2048b9f839c270d49f38ac6bf3dd32800f0f
2020-03-05 17:28:29 +00:00
Automerger Merge Worker
5487890d1c PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: ffe0b05d59
Change-Id: Id3d8814143c5a1708ab0fdaacff70476f509c1d2
2020-03-05 17:27:13 +00:00
Automerger Merge Worker
a076dbac9f PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: 43b1a3a5f4
Change-Id: I54af8f1e417172b407dd766b44ddaefc2e4dacb6
2020-03-05 17:26:51 +00:00
Automerger Merge Worker
85aea667a6 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf
Change-Id: Ibc2eb0b51f3d90e9f50ae37e9c386321cf2a93ab
2020-03-05 17:18:49 +00:00
Automerger Merge Worker
a334d7a120 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: 942007d0bf
Change-Id: I548ad4b463510dd1deac6e355720574c62cf3410
2020-03-05 17:18:23 +00:00
Automerger Merge Worker
43b1a3a5f4 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582
Change-Id: Ibde4d5bbb5b41af0e0c706c971c20da1fdf54b93
2020-03-05 17:17:55 +00:00
Automerger Merge Worker
6993251d18 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64
Change-Id: I7006d0b41a188311cf9a395abd8ecce4d7e76864
2020-03-05 17:17:23 +00:00
Automerger Merge Worker
29a7e2f861 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: ece27868c4
Change-Id: Id49a9099fd2d86fe4b66bc8dddbdfe87758cda0c
2020-03-05 17:16:48 +00:00
Automerger Merge Worker
ffe0b05d59 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582
Change-Id: I2874831cdf21c3b0d51625bbf388b747af694a26
2020-03-05 17:16:38 +00:00
Automerger Merge Worker
ef5570fd64 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5
Change-Id: I99c8ee2ce6a6cb2a33ba9566bc2429183e6ed44d
2020-03-05 17:05:04 +00:00
Automerger Merge Worker
942007d0bf Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5
Change-Id: I09190f6d4174afc156d007f7385899683534ce2c
2020-03-05 17:04:54 +00:00
Julia Reynolds
64fff70aa5 Merge "Use contrasted color icons" into rvc-dev 2020-03-05 17:02:15 +00:00
Automerger Merge Worker
ece27868c4 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1
Change-Id: Idaa3569dbc41841a59103fd77c6d56895d89a102
2020-03-05 17:00:34 +00:00
Automerger Merge Worker
f82f82a582 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1
Change-Id: I45745a9da40801e42dbaa2d3c1821e39fad33f4d
2020-03-05 17:00:33 +00:00
menghanli
fd5143751e Update edit shortcut dialog measurements and assets.
Bug: 148837311
Test: Manual test
Change-Id: I0c018f3f39e43657cbbd45734846213c9964a268
2020-03-05 22:32:33 +08:00
SongFerngWang
8598dccce1 PreferredNetworkModePreferenceController's summary no 5G item
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-05 14:08:53 +00:00
Automerger Merge Worker
6c7df4b997 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 3e2a45b3b8 am: 3acae78c2a am: 4843d800ad
Change-Id: I8ef6f19cd63a133993f7ee429e51ca83dac0527d
2020-03-05 12:39:02 +00:00
Automerger Merge Worker
4843d800ad String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 3e2a45b3b8 am: 3acae78c2a
Change-Id: Ib9e371991a43731c0d2beae6905a1976f00ceb37
2020-03-05 12:30:31 +00:00
Automerger Merge Worker
7df36c65fa String change on Storage page am: b7a3c9a8c6 am: b7fedbde23 am: a4bb9f3ea2 am: 2051c18f49
Change-Id: Id8f0aa7e93b4119658f7d8a735ca9c4e38bff25b
2020-03-05 12:30:25 +00:00
Automerger Merge Worker
4d2845f3c4 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 5fcf5bae8d am: ae768eeeb9
Change-Id: I460ec46e1de5617af5952367880515f459d61506
2020-03-05 12:30:20 +00:00
Automerger Merge Worker
2051c18f49 String change on Storage page am: b7a3c9a8c6 am: b7fedbde23 am: a4bb9f3ea2
Change-Id: I379dc1569b96de47afe3bd0327c2239ce4341638
2020-03-05 12:12:44 +00:00
Automerger Merge Worker
ae768eeeb9 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 5fcf5bae8d
Change-Id: I2b5451b7d7ececf7fb4bc1acf87c1a95b0c2b810
2020-03-05 12:12:39 +00:00
Automerger Merge Worker
3acae78c2a String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 3e2a45b3b8
Change-Id: Id4bf93919fe471a5b2455456d7b3292fe20cd79f
2020-03-05 12:12:25 +00:00
Automerger Merge Worker
a4bb9f3ea2 String change on Storage page am: b7a3c9a8c6 am: b7fedbde23
Change-Id: I8ab6e7f90c139f36ab378695fb5afc2e3f26d116
2020-03-05 12:01:54 +00:00
Automerger Merge Worker
3e2a45b3b8 String change on Storage page am: b7a3c9a8c6 am: f3adfad699
Change-Id: Ic88d76fa3cc34691b2b17f980291782ffe02fbbb
2020-03-05 12:01:47 +00:00
Automerger Merge Worker
5fcf5bae8d String change on Storage page am: b7a3c9a8c6 am: f3adfad699
Change-Id: I4903b1ae433e12d234a19552f6f0daa623798d5c
2020-03-05 12:01:40 +00:00
Automerger Merge Worker
b7fedbde23 String change on Storage page am: b7a3c9a8c6
Change-Id: Ib41098cad76e8f35cb96c1297a44286ec206683c
2020-03-05 11:45:30 +00:00
Automerger Merge Worker
f3adfad699 String change on Storage page am: b7a3c9a8c6
Change-Id: Iab4ceef706eb5f2ce9271d5cb188a70d89eeb3ef
2020-03-05 11:45:21 +00:00
Arc Wang
ac5e1acfba [Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled
In the current Settings framework onSwitchToggled has been implemented
to monitor the change in Settings done by user but its getting called
even when Settings is changed using setChecked where under certain
condition like rotation during config changed,
Tether Settings is disabled and then enabled and later before Rotation
Settings remained false due to stop Tethering with Tether Enabled
After Rotation when settings is initialized it is set as disabled
and even after receiving the Tether Enabled it remains Off.
Hence used onClick to monitor user ON/OFF Settings

Bug: 142625203
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest.java
Test: Manual
1. Go to Wifi Hotspot Settings
2. Turn ON
3. Change SSID and save
4. Rotate screen soon after saving
Result: Hotspot does not turn ON, remains in OFF state.
Signed-off-by:JeiFeng Lee <linger.lee@mediatek.com>

Change-Id: Ibddacdf35eb3196f40cdb2c240efa902f9123646
2020-03-05 18:21:39 +08:00
Automerger Merge Worker
7818ca8276 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: 6d7acf94be am: 7aebe40613 -s ours am: e2265d1f52 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: Iea8a9d0c92294c5f4b939aeed14c27d749f3f13c
2020-03-05 08:45:55 +00:00
Automerger Merge Worker
e2265d1f52 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: 6d7acf94be am: 7aebe40613 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I607e223ce57c31d28718fb8d07b3428b17aa8af5
2020-03-05 08:45:46 +00:00
Automerger Merge Worker
9cdedb58e5 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 087e60ca06 -s ours am: f225074bd0 -s ours am: e0ef60e5e5 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I0c0df9dc21e55f1b7f5e8373cf78c18444c54af1
2020-03-05 08:45:41 +00:00
Automerger Merge Worker
6ed7d1bd75 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: a8c2f1cb3c am: 1f9854d781 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 b3c0a2a6c1 is in history

Change-Id: I5ba50e275f98dd5304121af841a009fbda7bfaa3
2020-03-05 08:45:20 +00:00
Tsung-Mao Fang
b7a3c9a8c6 String change on Storage page
The string of the CTA under "Settings > Storage" from "Free up space" to
"Manage storage" to match the new ux flow.

Test: visual
Fix: 150782402
Change-Id: Ic636d73b92f11f6f332475d591ff92633083bc85
2020-03-05 08:45:03 +00:00
Automerger Merge Worker
e0ef60e5e5 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 087e60ca06 -s ours am: f225074bd0 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I637a8f6f00ee91d6305eefe6b57c782c45afc20c
2020-03-05 08:31:53 +00:00
Automerger Merge Worker
1f9854d781 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: a8c2f1cb3c
Change-Id: I2f334f1861a03094826a762a41f57670ad70423e
2020-03-05 08:31:41 +00:00