Automerger Merge Worker
60a9d95880
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours am: 9b03774e7c
...
Change-Id: I01d8903db074c14d717a024fb1d082cb9490732a
2020-03-06 00:39:54 +00:00
Kevin Chyn
260a77f39d
Update enrollment with API update
...
Bug: 150499348
Fixes: 150823201
Test: Builds
Test: CtsVerifier
Change-Id: Ic02b43447d1baaaa611e265498c8790d8812a12d
2020-03-05 16:39:39 -08:00
Automerger Merge Worker
f8d7068d84
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I36730d6958077d8f43cd1bd259f2071c898c6d8e
2020-03-06 00:26:03 +00:00
Automerger Merge Worker
9b03774e7c
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17 am: 567f83adbe -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia410ff9b6c93b99dc2a3e0a162bdc32881901589
2020-03-06 00:25:28 +00:00
Automerger Merge Worker
3dfc9bc59f
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb
...
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17
...
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
2020-03-06 00:12:13 +00:00
Zhen Zhang
1745955f35
Refresh summary when update state of preference
...
TogglePreferenceController won't call refresh summary for
SwitchPreference. Need to call it explicitly in updateState to update
the subtext.
Bug: 150885013
Test: Manually test
Change-Id: I0dafd78d867fc0c66906ee9a2daa7692bb15224b
2020-03-05 14:10:37 -08:00
Automerger Merge Worker
42641c920f
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e am: 29d7026da0 am: 030fcde124 -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 20:23:29 +00:00
Automerger Merge Worker
030fcde124
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e am: 29d7026da0
...
Change-Id: Ie7251022c64cbe111e793269bf079f4597da1a08
2020-03-05 20:04:19 +00:00
Automerger Merge Worker
3d6d90c62f
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e -s ours am: 90d73cdcd7 -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 19:47:02 +00:00
Automerger Merge Worker
9de88efcb9
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: 90a99332e7 am: c752d03daf
...
Change-Id: Id2eb3cd0113fa969ba1dc2ec6629b1398818890e
2020-03-05 19:45:26 +00:00
Automerger Merge Worker
29d7026da0
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e
...
Change-Id: I5bc5c54bde2ec94fadef01cb8639d8c025b2ecb6
2020-03-05 19:45:23 +00:00
Automerger Merge Worker
90d73cdcd7
[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: fbbda91c9e -s ours
...
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
2020-03-05 19:45:10 +00:00
Automerger Merge Worker
c752d03daf
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54 am: 90a99332e7
...
Change-Id: I62d54c4b09958cff163815eeea16bbaa95b0d581
2020-03-05 19:40:30 +00:00
Automerger Merge Worker
90a99332e7
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
2020-03-05 19:33:47 +00:00
Automerger Merge Worker
fbbda91c9e
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: I8141fb2fdb2d0224e4014d9e10686ceb3b304dfd
2020-03-05 19:33:41 +00:00
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
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
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
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
