Rubin Xu
ece83c3142
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
am: b87ed9fac5
am: 715f9316da
am: 2edcafc323
am: 5271685c19
...
Change-Id: I017ae5f940c9c4564a3da0ff88ac5500e58914e2
2020-04-15 23:54:05 +00:00
TreeHugger Robot
53aee5bf1f
Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
am: 00fea22696
am: 62b01fdf6f
am: 0f7b584db3
am: 67770f7f82
...
Change-Id: Ifac92c60787375863f20ab7453e720021d927cbc
2020-04-15 19:47:17 +00:00
Rubin Xu
5271685c19
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
am: b87ed9fac5
am: 715f9316da
am: 2edcafc323
...
Change-Id: I5e335d87c5fde2423c6bfb3f3a0b8464fafb6def
2020-04-15 18:48:43 +00:00
TreeHugger Robot
67770f7f82
Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
am: 00fea22696
am: 62b01fdf6f
am: 0f7b584db3
...
Change-Id: I6fc01ad7c4e9f7b481a1825a353e7ee54d16834b
2020-04-15 18:46:29 +00:00
Rubin Xu
2edcafc323
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
am: b87ed9fac5
am: 715f9316da
...
Change-Id: I4e8633ddb9fb2dd65280f1ddd377942910ee4876
2020-04-15 18:18:03 +00:00
TreeHugger Robot
0f7b584db3
Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
am: 00fea22696
am: 62b01fdf6f
...
Change-Id: Ie90c3bbf3288f1a6282dd48377e134ece912f41e
2020-04-15 18:16:31 +00:00
TreeHugger Robot
a2be65f64d
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 36b3b9a035
am: e192807da3
am: ae32869f21
...
Change-Id: I3ce1a035bd445273aab0bb733d0f96af4cc3d84f
2020-04-15 18:10:05 +00:00
TreeHugger Robot
282ad04497
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 6c2c780fd8
am: 046076a9b3
am: 333285315f
am: 0d9974fbdb
...
Change-Id: I60eb63a09d819522cd447c7f7d1335cd0000f2fc
2020-04-15 18:05:18 +00:00
TreeHugger Robot
ee1e6b196f
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 9625a5ed1f
am: b8d16ee675
am: bbcb1f910e
am: 2352636e78
...
Change-Id: Ie75a6c832bf9559f25713ad8b333d49e4408814b
2020-04-15 18:04:48 +00:00
Vince Leung
11c5fa4f3c
[automerger skipped] Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
am: 6899a1ad06
am: a20accec2e
-s ours am: 493f5bea32
-s ours
...
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 7d6c329746
is in history
Change-Id: Ifa107be8e36221f5ae757fc508989006a188310c
2020-04-15 18:03:56 +00:00
TreeHugger Robot
719445f809
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 63536f8392
am: 631d0d054f
am: 1f65b13cf4
...
Change-Id: Id145554f3cf6c03d7e6f47b9e38791fb874d31cb
2020-04-15 18:03:13 +00:00
TreeHugger Robot
4c215ee1ca
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 6c2c780fd8
am: 8910d9cae0
am: d4ed704604
...
Change-Id: I1c76151b269d42754b35a9b9d3fc2fd7cee681d8
2020-04-15 18:00:28 +00:00
TreeHugger Robot
ae32869f21
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 36b3b9a035
am: e192807da3
...
Change-Id: I980d778beda73bb3921b202aed6c3fd1979679c6
2020-04-15 18:00:10 +00:00
TreeHugger Robot
c7107909ae
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 9625a5ed1f
am: 7e00c8d28c
am: 7763d89c45
...
Change-Id: I77207c5d0a6875a33f26217270ea7894b38980f6
2020-04-15 17:59:57 +00:00
TreeHugger Robot
0d9974fbdb
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 6c2c780fd8
am: 046076a9b3
am: 333285315f
...
Change-Id: I1ff42f0a0cf4bd12c7bce6709bb75ddd68045e57
2020-04-15 17:58:41 +00:00
Vince Leung
826096c0af
[automerger skipped] Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
am: ed5f54623d
am: 840b29583a
-s ours
...
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 eb27aefa32
is in history
Change-Id: I7cc002d8c2c969aca4732e2599d0c049f1d311a0
2020-04-15 17:58:00 +00:00
TreeHugger Robot
2352636e78
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 9625a5ed1f
am: b8d16ee675
am: bbcb1f910e
...
Change-Id: I3cb17be8502c84d718bc84be58571fefa926febb
2020-04-15 17:57:53 +00:00
Vince Leung
493f5bea32
[automerger skipped] Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
am: 6899a1ad06
am: a20accec2e
-s ours
...
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 7d6c329746
is in history
Change-Id: Ibd15a35ad6fd41dd738a0103d3eb8c5873dbf827
2020-04-15 17:56:35 +00:00
Rubin Xu
715f9316da
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
am: b87ed9fac5
...
Change-Id: I68c7fce04c0193093d94cf3dd9ede1b3bbd8b426
2020-04-15 17:48:39 +00:00
TreeHugger Robot
62b01fdf6f
Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
am: 00fea22696
...
Change-Id: Iaa53ddb545b732bcb29c9cf5e5f93a3548b172f7
2020-04-15 17:46:50 +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
1f65b13cf4
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 63536f8392
am: 631d0d054f
...
Change-Id: I47505c0a3eda78bd385881ab03f405d7aa572c12
2020-04-15 17:32:30 +00:00
TreeHugger Robot
333285315f
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 6c2c780fd8
am: 046076a9b3
...
Change-Id: I2d8237dda79d1e3b5cb00b884e6476f0299cd8ae
2020-04-15 17:31:37 +00:00
TreeHugger Robot
d4ed704604
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
am: 6c2c780fd8
am: 8910d9cae0
...
Change-Id: Ibefba1525c620486940913f771783e4e3eb5096a
2020-04-15 17:31:20 +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
bbcb1f910e
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 9625a5ed1f
am: b8d16ee675
...
Change-Id: Ib8f84359e6c88758c53d2b49d16f7187d547d63d
2020-04-15 17:30:19 +00:00
Vince Leung
a20accec2e
Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
am: 6899a1ad06
...
Change-Id: Id25d866d0471acdb71a2bfffef899ef48164c54d
2020-04-15 17:30:03 +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
TreeHugger Robot
7763d89c45
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
am: 9625a5ed1f
am: 7e00c8d28c
...
Change-Id: I1b5992e89c8b8e801d318129cc89c0dbdf122675
2020-04-15 17:28:55 +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
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
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
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
Rubin Xu
81d8664d81
Merge "Improve work profile unification flow" into rvc-dev
2020-04-15 11:18:00 +00: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
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