Commit Graph

59754 Commits

Author SHA1 Message Date
Automerger Merge Worker
b6dccade98 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31
Change-Id: Iccd988b73822fef179ed23457080d7fff1503b11
2020-03-06 06:38:15 +00:00
TreeHugger Robot
a6760b347c Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev 2020-03-06 06:27:29 +00:00
Automerger Merge Worker
54fddb8d31 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266
Change-Id: Ibf9f04e2ea4f0d44814d65919dfc7d7f60b31fd5
2020-03-06 06:14:42 +00:00
menghanli
a5936ba266 Fix Robotests failure on accessibility ShortcutPreference
Bug: 150906744
Bug: 150910193
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I2feaad60eae3688f6452c29242affc55a80411a0
2020-03-06 13:39:15 +08:00
Tim Peng
bd56ef94d2 Add string for output switcher transferring state
Bug: 150903460
Test: manual
Change-Id: Iaebe013e891300f3275ff551e79e3298e55e21c4
2020-03-06 13:14:07 +08:00
Yi-Ling Chuang
91ec8ce068 Fix AdaptiveSleepPreferenceControllerTest.
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08:00
Automerger Merge Worker
702e5bb44f Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b
Change-Id: I1ae3557444b95d625287d0872792ab042098d005
2020-03-06 03:55:45 +00:00
Chris Tate
12ed043fdb Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
2020-03-06 03:54:52 +00:00
Automerger Merge Worker
1cf856987b Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
Change-Id: I854e60b9980f3ad63eafa519966d98450ecb8bb8
2020-03-06 03:38:51 +00:00
Automerger Merge Worker
e7fd1cbc4e Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
Change-Id: Id9d87fb99e8329572568e064518466017c030fb5
2020-03-06 03:20:31 +00:00
Betty Chang
997a458e76 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev 2020-03-06 03:01:32 +00:00
Automerger Merge Worker
86ce68877f DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
2020-03-06 01:35:03 +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
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
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
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