Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,095 Commits 1 Branch 0 Tags
a64c7679a0f03709362a684d4d3083f6bec1765e
Commit Graph

62095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calvin Pan
a64c7679a0 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d 
Change-Id: Ia015e81cc3d9f485272cd918bd8bc2e1b5e39b3d
 2020-04-15 17:49:27 +00:00
TreeHugger Robot
de064c6c54 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe 
Change-Id: I5bb6c994ccf6dca6d61f843fd1f8846875be2688
 2020-04-15 17:49:09 +00:00
Automerger Merge Worker
1824dc93bc Merge "Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: d5a33f2a95" into rvc-d1-dev-plus-aosp 2020-04-15 17:48:54 +00:00
PETER LIANG
f64b990432 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 
Change-Id: I28a47ba352e2eef548f7a9acd2ee1299d9f441d6
 2020-04-15 17:48:49 +00:00
Rubin Xu
2cf3b8d313 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: d5a33f2a95 
Change-Id: I022b7097e02774c77be982d8ee4a27a6de28ab69
 2020-04-15 17:48:49 +00:00
Rubin Xu
9e1c6293d1 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 
Change-Id: I0114acce3b613d387049bcfe30918821637d7860
 2020-04-15 17:48:22 +00:00
TreeHugger Robot
af62d57cb9 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 0dc62b8817 
Change-Id: I073599f54260594180e49a025f3a1a0b479973c9
 2020-04-15 17:47:14 +00:00
TreeHugger Robot
8a28fb2b7e Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 
Change-Id: Ifae44e30175e531432182b3301d4ca8964e213d7
 2020-04-15 17:46:22 +00:00
TreeHugger Robot
e192807da3 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 36b3b9a035 
Change-Id: I7611ec2c71b0b3496f8662ac11f414a1133bae8e
 2020-04-15 17:43:02 +00:00
TreeHugger Robot
631d0d054f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 63536f8392 
Change-Id: Ic69f049a6bade5c7fa2221369cc21c5da7ca8219
 2020-04-15 17:31:04 +00:00
TreeHugger Robot
8910d9cae0 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 
Change-Id: Ifce877e9902bc841c68030d795c496a94272dca4
 2020-04-15 17:29:09 +00:00
Calvin Pan
106c2d210d Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 
Change-Id: I32dd168ae94fa39923e373a0b25a8012998e2c45
 2020-04-15 17:28:40 +00:00
TreeHugger Robot
65353e9dfe Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf 
Change-Id: I7c13a0f6adeda0689911848c799a551f27971b99
 2020-04-15 17:28:17 +00:00
PETER LIANG
4c7a690479 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 
Change-Id: I0f135b960440a997116e3cb6e79b2d5380cb7aad
 2020-04-15 17:26:37 +00:00
Rubin Xu
b87ed9fac5 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 
Change-Id: I17cc8fb5d338336c091f6620cc015880efb0c83b
 2020-04-15 17:25:43 +00:00
Rubin Xu
d5a33f2a95 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 
Change-Id: Iae4d6b732a6da338aa7e6488402d5b21150669ec
 2020-04-15 17:25:30 +00:00
TreeHugger Robot
0dc62b8817 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd 
Change-Id: Id842a57c8195c98c7f3239604a457da424f011c5
 2020-04-15 17:23:27 +00:00
TreeHugger Robot
00fea22696 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd 
Change-Id: I3f3840b14f62be6badf1d0bd816327fb267e005c
 2020-04-15 17:23:15 +00:00
TreeHugger Robot
6c2c780fd8 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 
Change-Id: Iff4980697cc6748777bf491f0d74e4aa7a1fde5b
 2020-04-15 17:17:31 +00:00
TreeHugger Robot
7e00c8d28c Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f 
Change-Id: If6f8b0f6e9391c5fad747655f9707420c3308372
 2020-04-15 17:14:48 +00:00
TreeHugger Robot
36b3b9a035 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 
Change-Id: Iea4d243399d902cc785be33a976e7a481160be46
 2020-04-15 17:14:33 +00:00
TreeHugger Robot
63536f8392 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 
Change-Id: I60fc8f0427b85a27599e29c3b5c62f66efe330c2
 2020-04-15 17:01:22 +00:00
TreeHugger Robot
9625a5ed1f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 
Change-Id: I298c67ecb36a20b733387ffdd88e5353c4445fdf
 2020-04-15 17:00:26 +00:00
Vince Leung
ed5f54623d Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 
Change-Id: I9c8c78981cdcac3fbee321c78392e8432fcba97a
 2020-04-15 16:59:32 +00:00
Calvin Pan
0758056d04 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev 2020-04-15 14:32:18 +00:00
TreeHugger Robot
82282b48cf Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev 2020-04-15 13:30:33 +00:00
PETER LIANG
eb04ef4f75 Merge "Revising the function name related to user shortcut type." into rvc-dev 2020-04-15 12:49:07 +00:00
Rubin Xu
81d8664d81 Merge "Improve work profile unification flow" into rvc-dev 2020-04-15 11:18:00 +00:00
Peter_Liang
58cc3ea7f9 Revising the function name related to user shortcut type. 
Should add 's' into the name.

Bug: 148989018
Test: manual test
Change-Id: I46aadb80f4f28dc1794fc3313563c79be149e847
 2020-04-15 17:43:05 +08:00
calvinpan
37812984f4 Add missing NR network mode in setPreferenceValueAndSummary 
Bug: 152816633
Test: atest
Change-Id: I6c97ebc7c04671702a9df2a79c85b27f6f239c23
 2020-04-15 17:24:49 +08:00
TreeHugger Robot
566d9f49bd Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev 2020-04-15 08:47:04 +00:00
SongFerngWang
e60faf8056 [5G settings UI] add UI for the 5G limited VoLTE dialog 
when the user disables VoLTE, UE show alert dialog for 5G disable.

Bug: 151313654
Test: build pass. manual test: UI show alert dialog.
Change-Id: I5ea4d59017b5d9db6f7c3d8d0ffd24d5a2c61457
 2020-04-15 15:05:30 +08:00
Vince Leung
fa63980566 Merge "Use super method for Vibration preferences" into rvc-d1-dev 2020-04-15 03:53:01 +00:00
TreeHugger Robot
e13a54c438 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev 2020-04-15 03:13:08 +00:00
TreeHugger Robot
ccb37bb8d1 Merge "Refactor the OpenSupportedLinks" into rvc-dev 2020-04-15 03:09:01 +00:00
Sunny Shao
44b74c9cfe Refactor the OpenSupportedLinks 
- Use the AppInfoWithHeader to replace the DashboardFragment.
- It provide the AppHeader controller and handle the app update/remove event.

Fixes: 147996227
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications.OpenSupportedLinksTest
Change-Id: I1633c39fc926805a379c5c31845897914e5181a6
 2020-04-15 09:53:43 +08:00
Yanting Yang
2483124478 Fix breadcrumb for the search results of Custom restrictions page 
Settings Search need Settings to provide the custom site map pairs to
build up the full breadcrumb for the search results of Custom
restrictions page.

Impact search results:
Don't turn on screen
Don't wake for notifications
Hide notification dots on app icons
Hide status bar icons at top of screen
Don't pop notifications on screen
Hide from pull-down shade
Custom restrictions

Bug: 147851992
Bug: 151206664
Test: visual and robotests
Change-Id: I01e359eabcdc362e2a1fde5f3bc4ae5dc6918030
 2020-04-15 08:52:05 +08:00
Menghan Li
3cb796ad72 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 
Change-Id: Id921d9ea3ad24c3b4d8edac0165b16034c5b715d
 2020-04-14 22:56:33 +00:00
Menghan Li
d88487448d Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb 
Change-Id: Ib0fe68aed2175bbc03e1a7e20f9fab6d3e602c4b
 2020-04-14 22:43:46 +00:00
Menghan Li
702e607c09 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 
Change-Id: I5032dee01f02bb6f4f1a4ffbca43550c0556ffbf
 2020-04-14 22:34:26 +00:00
Menghan Li
a8d035b6fb Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 
Change-Id: Ica23de459026f96284bd05806fb41bc10fbe4c19
 2020-04-14 22:32:56 +00:00
Menghan Li
b5a0ff7ee9 Merge "Fine tune the maganication area edit dialog" into rvc-dev 2020-04-14 22:12:46 +00:00
TreeHugger Robot
32c9343e9f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours 
am skip reason: subject contains skip directive

Change-Id: I81dc7baa5b3220b142fcefba3822957c31e892bc
 2020-04-14 17:14:15 +00:00
TreeHugger Robot
2dcf16dbb5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: b383a523c7 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3fc7df67891de4741c228073b5fd0b02988f3e9f
 2020-04-14 17:13:59 +00:00
TreeHugger Robot
86c47713b0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ied85b54fa14da4bf75f5fab830874730c4137b75
 2020-04-14 17:12:31 +00:00
TreeHugger Robot
0f16c8c93d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours 
am skip reason: subject contains skip directive

Change-Id: Id6a385bc0e0e8a3f5cd2c2d2e4b39e6b4003a9ec
 2020-04-14 17:12:19 +00:00
TreeHugger Robot
d95b9f059f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic5d1c3de7725e0ce628d965fb01abb42516839ce
 2020-04-14 16:50:21 +00:00
TreeHugger Robot
b383a523c7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2312d37d3d18d6666e1effd5e9e90a89a35b4f39
 2020-04-14 16:50:01 +00:00
TreeHugger Robot
8d9b3172c8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours 
am skip reason: subject contains skip directive

Change-Id: Id4cd0d448e621bde289b264d403e1d7ca3e80077
 2020-04-14 16:49:06 +00:00
TreeHugger Robot
55e3f34b5e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ida2c0804943b4be8a6409e9a93c8ededafa11c8d
 2020-04-14 16:48:39 +00:00