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

59696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
56f80dad28 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 5585d61a51 
Change-Id: I0966351b670a048544bc47d9ee4ab24eac6cf2a1
 2020-03-06 06:38:13 +00:00
Automerger Merge Worker
f033a896ff Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 am: 54fddb8d31 
Change-Id: If9964ee4569c18b27dba54c2db6e200ac7df253e
 2020-03-06 06:37:45 +00:00
TreeHugger Robot
a6760b347c Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev 2020-03-06 06:27:29 +00:00
Automerger Merge Worker
5585d61a51 Fix Robotests failure on accessibility ShortcutPreference am: a5936ba266 
Change-Id: Ifa92c4ff403eca485552a2cbc265c41472405e26
 2020-03-06 06:14:49 +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
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
56884a847d Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: 081c161005 
Change-Id: Ib09b0f3bc7d3e282a4a7868130794d21f0981ea3
 2020-03-06 03:39:06 +00:00
Automerger Merge Worker
ac742b040a Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e 
Change-Id: I43264354b76900c510e2a49d1f702b8440cb7e30
 2020-03-06 03:39:01 +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
Automerger Merge Worker
081c161005 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 
Change-Id: Ie0b97fe0fa7d8da3ad105a44f1686bac23eba775
 2020-03-06 03:20:17 +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
Automerger Merge Worker
73800ebe86 [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb am: 3dfc9bc59f -s ours am: f8d7068d84 
Change-Id: I722bf3230097a9e07f9aa44c2e9e209e17dfb05a
 2020-03-06 00:40:30 +00:00
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
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
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 is in history

Change-Id: I0e657d6c6db35c8d50c16996c315e1c378a0ea1f
 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
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
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
a4bb9f3ea2 String change on Storage page am: b7a3c9a8c6 am: b7fedbde23 
Change-Id: I8ab6e7f90c139f36ab378695fb5afc2e3f26d116
 2020-03-05 12:01:54 +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
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
f225074bd0 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 087e60ca06 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I728e0d06a0f9e64814509f39b319c20b34df93b7
 2020-03-05 08:18:22 +00:00
Automerger Merge Worker
a8c2f1cb3c Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 
Change-Id: I6286e372401c62919998401972401b6ddf616a7b
 2020-03-05 08:18:13 +00:00
Automerger Merge Worker
087e60ca06 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 
Change-Id: I650985673b4c7401f5da545f8175f9baddb5f864
 2020-03-05 08:08:41 +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