Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,439 Commits 1 Branch 0 Tags
a51ed4f14ccb3a37234f2fa798dbb4200580eb79
Commit Graph

59439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a51ed4f14c Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 am: 83fb76a7fd 
Change-Id: I663c8c779d99107d661278a7c8e3941a46827a9a
 2020-03-06 14:34:41 +00:00
Automerger Merge Worker
83fb76a7fd Merge "Add string for output switcher transferring state" into rvc-dev am: c241e434d5 
Change-Id: I02c0925b503b7adb1d68c553eccb8c1f07a4d5e5
 2020-03-06 14:17:42 +00:00
tim peng
c241e434d5 Merge "Add string for output switcher transferring state" into rvc-dev 2020-03-06 14:08:28 +00:00
Automerger Merge Worker
e87b903aff Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 am: 9505f30f26 
Change-Id: I47e1a6f1f0c4dbe859fcacddcec3ae4f544e8961
 2020-03-06 09:57:26 +00:00
Automerger Merge Worker
9505f30f26 Merge "Ignore some failed tests." into rvc-dev am: 2093ad6ac0 
Change-Id: Ifc4ca755dbbfec5a78ee5edd79a56be1b9424eab
 2020-03-06 09:44:32 +00:00
TreeHugger Robot
2093ad6ac0 Merge "Ignore some failed tests." into rvc-dev 2020-03-06 09:23:35 +00:00
Automerger Merge Worker
715f9465e2 Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 am: 8be83502be 
Change-Id: I0fb54974dfd4fa0f3e13a15eb5e070e1e8f0aa23
 2020-03-06 09:11:34 +00:00
Automerger Merge Worker
e3cf2e8ef4 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 
Change-Id: I7f0295dd33b3756bc8a8a893db75f4554a4c352d
 2020-03-06 09:11:25 +00:00
Automerger Merge Worker
8be83502be Merge "Ignore failed test cases" into rvc-dev am: 90d5d45506 
Change-Id: Ia3e859432dada22a9bcdeb90eb7140b537b67434
 2020-03-06 08:57:34 +00:00
Automerger Merge Worker
7e89b41219 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 
Change-Id: I95978fe3e4f797fa94ddd51701e92b8f4cd6142f
 2020-03-06 08:57:23 +00:00
TreeHugger Robot
90d5d45506 Merge "Ignore failed test cases" into rvc-dev 2020-03-06 08:48:25 +00:00
Automerger Merge Worker
4a7ba9a3c9 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 
Change-Id: I0880e13a0bb8ac2cc3f4a2db21fe049d71da629a
 2020-03-06 08:45:19 +00:00
Lee Chou
f3ce231d17 Merge "Require authorization before turning off eSIM security feature" into rvc-dev 2020-03-06 08:45:09 +00:00
Automerger Merge Worker
696d25adf0 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb 
Change-Id: Ib3566a792f6d8671e4b4e84f64ed67f4c27eed86
 2020-03-06 08:23:30 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +00:00
Automerger Merge Worker
59b0979ed8 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 
Change-Id: I5177a15280048f62d67a5c27f069df1e0c6cd313
 2020-03-06 07:25:04 +00:00
Yi-Ling Chuang
db4fd2b1c3 Ignore some failed tests. 
These test failures may relate to change of PowerManager. Ignore them
first and will have people working on the fix.

Bug: 150914017
Test: robotests
Change-Id: Id4d3bb9945a993517964376b5d52e31dd293e634
 2020-03-06 15:20:09 +08:00
Automerger Merge Worker
32080a92e8 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 
Change-Id: I6923626d227d0c4c82989949f7f1bffeb165c00d
 2020-03-06 07:08:57 +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
tim peng
2d15cecf54 Merge "Add getSessionName() API for group name in worker" into rvc-dev 2020-03-06 06:56:30 +00:00
hughchen
fbea0dc06d Ignore failed test cases 
Bug: 150909916
Test: make RunSettingsRoboTests -j42
Change-Id: Ice6c8e635a0a39c0cf86ad60e0175222cf32cf4b
 2020-03-06 14:52:22 +08: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
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
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
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
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
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
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
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