PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,441 Commits 1 Branch 0 Tags
dfb634ddcf96a170ba16464a606715b31b0ac4ef
Commit Graph

59441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
dfb634ddcf Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 am: 8681e4fd57 
Change-Id: I4a232b06275c0f11c7ef55ed95efb38324a77a06
 2020-03-06 07:15:08 +00:00
Automerger Merge Worker
8681e4fd57 Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c am: 0e4b3e2d03 
Change-Id: I213be4da3435caa3073e289c5012f599bc6aa29e
 2020-03-06 07:03:20 +00:00
Automerger Merge Worker
afe7bcae29 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 am: b6dccade98 
Change-Id: Ieab18f8fb2769afff73bbc9e5b1409e08bde9ab4
 2020-03-06 06:52:56 +00:00
Automerger Merge Worker
0e4b3e2d03 Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev am: a6760b347c 
Change-Id: Iaa9b5708c70120bd64c1df79af82bb08bd45be2f
 2020-03-06 06:44:44 +00:00
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
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
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
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
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
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
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
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