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
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
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
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
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
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
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
jasonwshsu
0259f84c5f
Align help resource usage in caption preferences.
...
* Add string to get the help page intent
Bug: 149887377
Test: manual test
Change-Id: I15b9c4edd260153aa929d68845faed0af16a4ffa
2020-03-05 21:02:47 +08: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
3e2a45b3b8
String change on Storage page am: b7a3c9a8c6
am: f3adfad699
...
Change-Id: Ic88d76fa3cc34691b2b17f980291782ffe02fbbb
2020-03-05 12:01:47 +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
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
7aebe40613
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
am: 6d7acf94be
...
Change-Id: I1cebbe943e2f7354e666430d9d700087568020af
2020-03-05 08:31:31 +00:00
Automerger Merge Worker
6d7acf94be
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
...
Change-Id: Ia3a4a25e72c2884b1ca177d9a13a6325a0d409e8
2020-03-05 08:18:16 +00:00
Automerger Merge Worker
306f776fc3
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
...
Change-Id: I975aec9390ad68c3b38a56f2c79d6c66030c9e95
2020-03-05 08:08:38 +00:00
TreeHugger Robot
e8f1c6c814
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev
2020-03-05 07:53:51 +00:00
Automerger Merge Worker
7a14d9cdcf
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: 38e71ec3f0
...
Change-Id: Ib5ee773a9e8542e0ffc6497fa9943ca362824d20
2020-03-05 06:30:42 +00:00
Automerger Merge Worker
38e71ec3f0
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
...
Change-Id: Ib0182de84f512c9d83e3f2e709a7af1d108b78ce
2020-03-05 06:13:00 +00:00
Automerger Merge Worker
3cd1238aff
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
...
Change-Id: Ie52a859080d88cf517ed92615a52be9b4086087e
2020-03-05 05:58:56 +00:00
Tim Peng
c88dc498e8
Add getSessionName() API for group name in worker
...
Bug: 150827723
Test: make -j50 RunSettingsRoboTests
Change-Id: Id09cb61b8ce23520761252fbb8ffbe3e323adf8e
2020-03-05 13:49:04 +08:00
tim peng
5578920e4c
Merge "Add package name when launching output switcher from remote slice" into rvc-dev
2020-03-05 05:45:44 +00:00
Tsung-Mao Fang
2fc9fed89c
Fix pendingIntent in SettingsSliceProvider could be Hijacked
...
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.
So, we enfore assign the package name for this intent,
it only can launch the settings app.
Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.
Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1
)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-05 05:38:55 +00:00
Automerger Merge Worker
35e739759e
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: c2221502c5
...
Change-Id: Id87e896798a71ce18a77a2731b797728c9678dcd
2020-03-05 03:50:35 +00:00
Automerger Merge Worker
9ef9149bf0
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 93bab2ba1f
...
Change-Id: I42cb6b3ef2a18e70cdd9bf52fb89908384be33cc
2020-03-05 03:48:55 +00:00
Automerger Merge Worker
c2221502c5
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
...
Change-Id: Ibae1496eefbb951c0620d8e45c5e639637ee0b2a
2020-03-05 03:28:38 +00:00
Automerger Merge Worker
93bab2ba1f
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
...
Change-Id: I3b60652b4ed13e5f56b0e72fde87e5bdc3102399
2020-03-05 03:28:21 +00:00
Automerger Merge Worker
60bc99d812
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I246edbade67850ad044e7d7532c8cdde3c40ce32
2020-03-05 03:15:24 +00:00
Automerger Merge Worker
ccfe8c6624
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I50f84bf17daa3fc36b2bc40c953fe398ee5e34ad
2020-03-05 03:14:56 +00:00
Zhen Zhang
042aa85b50
Merge "Update SharedPreference values based on tethering state" into rvc-dev
2020-03-05 02:58:24 +00:00
TreeHugger Robot
d9f611fe6b
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev
2020-03-05 02:57:24 +00:00
changbetty
081414e84d
[Telephony Setting] Enable the Settings test case
...
Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkPreferenceControllerTest
Change-Id: I192385b1d847323d18ebc621f29ccc65cd7473d8
2020-03-05 10:21:54 +08:00
Steven Liu
cc6eb5c0f7
Remove the unnecessary dependent on WifiTrackerLib.
...
Bug: 150467119
Test: build
Change-Id: I947d4ee2f88aadc2d8b2002a2c5b04f60c4d853b
2020-03-04 14:51:27 -08:00
Automerger Merge Worker
8ee1f8c4de
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 12f8e63501
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I37b213830cc6771576efbebe849cb3c681ba8198
2020-03-04 21:43:04 +00:00
Automerger Merge Worker
12f8e63501
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I48f8b41a1c3efc8953d1e8f98b60ac37e275167a
2020-03-04 21:24:09 +00:00
Automerger Merge Worker
ff29ca26c5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a70d3e9d49991434380da5f9b72baa50a0f916d
2020-03-04 21:12:53 +00:00
TreeHugger Robot
b79218f56d
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-04 20:59:22 +00:00
Automerger Merge Worker
b807d163a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: bf7796baec
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ef189f15acb569f9c5aa573ee1ff58cdff29618
2020-03-04 20:34:45 +00:00
Automerger Merge Worker
bf7796baec
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I03c6634dc6ec628fc4e3f565d72ed4a1d04cc3f8
2020-03-04 20:11:03 +00:00
Automerger Merge Worker
b43406147b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifdeb07456af76024e651cf6723c71bcb037762f8
2020-03-04 19:53:27 +00:00
Automerger Merge Worker
e0bc29df11
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I98d470799b1ddddd9cc497d4f3729f2d04fd613c
2020-03-04 19:40:30 +00:00
TreeHugger Robot
3779025590
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-03-04 19:24:28 +00:00
Zhen Zhang
0c02d33818
Update SharedPreference values based on tethering state
...
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.
Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.
Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08:00
Automerger Merge Worker
2f5305fc55
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 94bdc99fac
...
Change-Id: Ief1f65f7bce92d20443fa61b70086b74f0a76ccc
2020-03-04 18:40:51 +00:00
Automerger Merge Worker
94bdc99fac
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
...
Change-Id: I7a92cd6f79f73b63a7dd7369142c40d5f8c4e638
2020-03-04 18:24:58 +00:00