Commit Graph

65715 Commits

Author SHA1 Message Date
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
Vince Leung
840b29583a Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 am: ed5f54623d
Change-Id: Ife3e46001f8d9e6bcb6a084b7ffbdb79087e79c5
2020-04-15 17:28:23 +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
TreeHugger Robot
046076a9b3 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8
Change-Id: I3e8c35947dae16bae658f65829b8db66007b332f
2020-04-15 17:28:04 +00:00
PETER LIANG
4f1175397c Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75
Change-Id: I5164350beee94ecf01a879546a085971d8b37914
2020-04-15 17:26:48 +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
b8d16ee675 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f
Change-Id: I170e27938a003371360d3b8f64c72f317023f1d3
2020-04-15 17:02:52 +00:00
Vince Leung
6899a1ad06 Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
Change-Id: Id36378b8448cc0fee4857186885616a0a886b2b2
2020-04-15 17:02:14 +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
c855b9efa5 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: 4a7387d0b2 am: e36a45ebce am: 276163c699 am: bb10c7e1df
Change-Id: I33a2ab63e5dc0104f47e6db2f61b075af871d577
2020-04-14 23:47:12 +00:00
Menghan Li
10320bbe47 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 am: 3cb796ad72 am: c0b28bb238 am: a4036a28f0
Change-Id: I9a1cf36690eb3800bb45119eefdaf3b688e393c1
2020-04-14 23:47:04 +00:00
Menghan Li
603449cfab Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: d88487448d am: 46a3fa93a8 am: 38713ec80a
Change-Id: Ia0ae4d4015d7028bf8bb641aff2d3acbec22566d
2020-04-14 23:46:26 +00:00
Menghan Li
bb10c7e1df Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: 4a7387d0b2 am: e36a45ebce am: 276163c699
Change-Id: I5d8d22c3a2302e600152ed55cb6513b4b4bb2b96
2020-04-14 23:37:05 +00:00
Menghan Li
276163c699 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: 4a7387d0b2 am: e36a45ebce
Change-Id: Iff00c3680a8a183d7eedeaa7e11e29ffe618466c
2020-04-14 23:27:16 +00:00
Menghan Li
a4036a28f0 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 am: 3cb796ad72 am: c0b28bb238
Change-Id: I1a7c00cb8a9404d6442255e6fd62907e3877be55
2020-04-14 23:26:13 +00:00
Menghan Li
38713ec80a Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: d88487448d am: 46a3fa93a8
Change-Id: I719edafbf7a8527ee0efddcc4146631094cb4356
2020-04-14 23:26:02 +00:00
Menghan Li
c0b28bb238 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 am: 3cb796ad72
Change-Id: Icecd94ecdaa7d0220ddd0ffe4a63b3439abbadb3
2020-04-14 23:04:03 +00:00
Menghan Li
46a3fa93a8 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: d88487448d
Change-Id: I99fc391c91464c7496386cfb6f92dda932178ba6
2020-04-14 23:03:57 +00:00
Menghan Li
e36a45ebce Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: 4a7387d0b2
Change-Id: I455eccb65b7b7da52ed0d48a1ec57a71ab279cc6
2020-04-14 23:03:47 +00: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
4a7387d0b2 Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb
Change-Id: Ib9b32d8b0ca947af798fad8159e2773e277eb9e1
2020-04-14 22:45:15 +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
ef54fabf0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 42aacf05dc -s ours am: 087616e36f -s ours am: bb69ae06a2 -s ours am: 2432b624c3 -s ours
am skip reason: subject contains skip directive

Change-Id: I75672aa02a52e56e6429843932a915889a60fa3e
2020-04-14 18:51:13 +00:00
TreeHugger Robot
38803830de [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: f513fee9b1 -s ours am: e2a07ad5e1 -s ours am: a12990d504 -s ours am: 3126978682 -s ours
am skip reason: subject contains skip directive

Change-Id: I13de5b92cfdec02dde6dfae3397189527e79f99f
2020-04-14 18:50:40 +00:00
TreeHugger Robot
8659f59e42 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours am: 32c9343e9f -s ours am: d427a2e9d1 -s ours am: 2524e45b38 -s ours
am skip reason: subject contains skip directive

Change-Id: I7dc77d57927fa8cb758fe0b3b8f1ba322c81aef5
2020-04-14 18:50:18 +00:00