Commit Graph

61881 Commits

Author SHA1 Message Date
Stanley Wang
8355a64983 Merge "Update char limit of string "Notification dot on app icon"" 2020-03-19 06:39:34 +00:00
tim peng
8e8ac25c41 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
Change-Id: I0015e42b8a6e1bf4fd0c96807e2465a12af84df9
2020-03-19 06:26:54 +00:00
tim peng
01d3b13273 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
Change-Id: Icbd0a3472d2a4cdb2c7b5cd4c8fef0464c736e87
2020-03-19 06:26:50 +00:00
Treehugger Robot
dd52dfcbe3 [automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 -s ours am: 3896ca809a -s ours am: 0ab49a04ac -s ours am: 8ffc80cea2 -s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521 is in history

Change-Id: I7617bb49f01e5a44c4e08fa2c1aa32bd46fed6a7
2020-03-19 06:26:35 +00:00
Treehugger Robot
8ffc80cea2 [automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 -s ours am: 3896ca809a -s ours am: 0ab49a04ac -s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521 is in history

Change-Id: Ifd5afd9273d12613306e34d87d559eafd57b64e2
2020-03-19 06:13:08 +00:00
tim peng
91ad46fa60 Merge "Close panel when media stop" into rvc-dev 2020-03-19 06:08:05 +00:00
Bonian Chen
48710d6499 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623 am: 49211ec318 am: 24f1bfd9f8 am: 706c0f51c8
Change-Id: Ib934282c85d3f1780e1f570257f4162634e8e942
2020-03-19 06:00:21 +00:00
Bonian Chen
485b79f866 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623 am: 5cb2d1e00a am: 46cc8377fb
Change-Id: Id318fc8c793142953f51b25ea5c4e5c59eb109fd
2020-03-19 05:57:45 +00:00
Bonian Chen
edfa0d3277 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: a65de8cd51 am: 0013a04115 am: 7b196f6b84
Change-Id: Iac3dc794074338f1c4491dcb7b97964fb3f8df91
2020-03-19 05:54:16 +00:00
Treehugger Robot
0ab49a04ac [automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 -s ours am: 3896ca809a -s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521 is in history

Change-Id: I0fab0c9e248dc48e69dcb45f2e7e0dd3db9c7905
2020-03-19 05:49:50 +00:00
Betty Chang
7d70e93ce4 [automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours am: 74304904c7 -s ours am: e997d9850c -s ours am: 8ca4991dd6 -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: Ic605fc8b2a2d32dae7c6f690b446a5a5079436cb
2020-03-19 05:49:30 +00:00
Bonian Chen
706c0f51c8 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623 am: 49211ec318 am: 24f1bfd9f8
Change-Id: Ie235deaf9930fd37d8da579a6a5f2c994bf415e5
2020-03-19 05:49:19 +00:00
Treehugger Robot
3896ca809a [automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 -s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521 is in history

Change-Id: I4cb5b55932b67330e1d167c80525172f4f86217b
2020-03-19 05:35:12 +00:00
Bonian Chen
24f1bfd9f8 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623 am: 49211ec318
Change-Id: I9efc361a61c85a6bd36734a23f4bf57cd0e36cbd
2020-03-19 05:34:37 +00:00
Bonian Chen
46cc8377fb Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623 am: 5cb2d1e00a
Change-Id: Ibf613dcff84f81f1be002a4dd00c22f97eb2e8f2
2020-03-19 05:27:23 +00:00
Bonian Chen
7b196f6b84 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: a65de8cd51 am: 0013a04115
Change-Id: I996174214797e75784551232376fa9189a18a1ab
2020-03-19 05:26:19 +00:00
Betty Chang
8ca4991dd6 [automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours am: 74304904c7 -s ours am: e997d9850c -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: I8d6c6910d56b54ed772ea67fdef9440ad214e184
2020-03-19 05:25:02 +00:00
Treehugger Robot
51c080aaf9 Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
Change-Id: I11c1999d2ad4502366acf8b29946d4412ed393c2
2020-03-19 05:12:32 +00:00
Bonian Chen
49211ec318 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623
Change-Id: Ic8fe75bd65d72e7008857405163d0fa35d5820f0
2020-03-19 05:12:16 +00:00
Bonian Chen
5cb2d1e00a Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: 7083092623
Change-Id: Ide9f91e52c4d5da97f4825a67414425c75b06f90
2020-03-19 05:12:00 +00:00
Bonian Chen
0013a04115 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: a65de8cd51
Change-Id: I11aa6f9d0cb3fa1a76a9f0d0e503f0883bc15cec
2020-03-19 05:04:56 +00:00
Tsung-Mao Fang
6f6e6810ae Tweak string for Display over other apps
Fix: 144901996
Test: Visual
Change-Id: I5dacf8146130431624300d04421351a87ebd4d23
2020-03-19 05:04:53 +00:00
Betty Chang
e997d9850c [automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours am: 74304904c7 -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: Ia7f6d8c97eb96ad8188df5740d1769e574f7e313
2020-03-19 05:04:45 +00:00
Treehugger Robot
2dd19966b7 Merge "Fix sim pin lock preference disappear in dual sim." 2020-03-19 04:57:26 +00:00
Bonian Chen
a65de8cd51 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
Change-Id: Id53c6a31d6c3dcf61482f1d3fcff13bb17a6ffa3
2020-03-19 04:48:29 +00:00
Bonian Chen
7083092623 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
Change-Id: I74165063a6b4924529cb4e25652756fa713b5048
2020-03-19 04:48:18 +00:00
Betty Chang
74304904c7 [automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: I3e3d9481426bbb02dc7be34dfabd95a35731cda2
2020-03-19 04:42:42 +00:00
Bonian Chen
c073abaf2e Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev 2020-03-19 04:35:39 +00:00
Betty Chang
f695abfc29 Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
Change-Id: I3a4b569e11a2c8235ce9adfa051cd6f795a02678
2020-03-19 04:29:29 +00:00
SongFerngWang
6c9ce4d892 Fix sim pin lock preference disappear in dual sim.
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
Merged-In: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-19 12:13:37 +08:00
Betty Chang
e5f9bde2fd Merge "[Mainline] Use public method in SubscriptionManager for mainline" 2020-03-19 04:09:34 +00:00
Lee Chou
443cfd2ef4 Adds logging to confirm esim deletion feature
Bug: 138861284
Test: make SettingsGoogle  and manual testing
Change-Id: Ie5f6f6a31003733ae7abd9c04e9b3c371d5051c4
2020-03-19 12:07:01 +08:00
Stanley Wang
3e56b9ddcc Update char limit of string "Notification dot on app icon"
- The hightest needed character limit is at 48.
  Update char limit to 50.

Fixes: 151634666
Test: Rebuid Settings
Change-Id: I424cfe1519fbb2fef99a195428aa65bc7b5f8862
2020-03-19 12:02:43 +08:00
TreeHugger Robot
7169b6b25f [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 56cd70f100 am: 13d84b4a96 -s ours am: 2444e29f01 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I0af52feb6870ee1ab7423bd5945f67882b317cbc
2020-03-19 03:32:56 +00:00
TreeHugger Robot
c0156b3c44 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: 97cc247663 -s ours am: 09ed274f05 -s ours am: 644d7a3cfe -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I92b1a282db1f363e77bd0f6d2dbe49a480a15d4f
2020-03-19 03:32:18 +00:00
TreeHugger Robot
278f6a4a35 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 9e94fc6afa am: b757cdbe07 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 86a6cb8ead is in history

Change-Id: I8c6f23a40706dad990a3fb746ae14c3203b69ef8
2020-03-19 03:30:26 +00:00
TreeHugger Robot
2444e29f01 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 56cd70f100 am: 13d84b4a96 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: Ic7632df1451510589541b7c401e3580759e9b89f
2020-03-19 03:30:03 +00:00
TreeHugger Robot
644d7a3cfe [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: 97cc247663 -s ours am: 09ed274f05 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I370528bfed63bf996822d007e95352a14f1b95c9
2020-03-19 03:23:11 +00:00
TreeHugger Robot
13d84b4a96 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 56cd70f100
Change-Id: Icfd2a5d5b651f3eed97e32a744d3338857d66043
2020-03-19 03:23:00 +00:00
TreeHugger Robot
b757cdbe07 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 9e94fc6afa
Change-Id: Ifaaea085c25dd1a464442db3ccd676283d15640b
2020-03-19 03:23:00 +00:00
SongFerngWang
4f0d7b3781 [5G settings UI] add String for the 5G limited VoLTE dialog
while User disable VoLTE, UE show warning Dialog for 5G disable
add String for it.

Bug: 151313654
Test: build pass.
Change-Id: I2246664f1acbd2489dc3540486a7e1fa08d66656
2020-03-19 11:17:45 +08:00
TreeHugger Robot
09ed274f05 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: 97cc247663 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I95b0e51c6cf838c395fa330e14561e45fa535739
2020-03-19 03:12:49 +00:00
TreeHugger Robot
56cd70f100 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7
Change-Id: I311015bab8db333bb1f87a7cfe436d4cfe5e48fa
2020-03-19 03:12:47 +00:00
TreeHugger Robot
9e94fc6afa Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7
Change-Id: Id7287ffa053c08817c3c4f5ba71dea3ab649a21f
2020-03-19 03:12:28 +00:00
TreeHugger Robot
97cc247663 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
Change-Id: Icad20acd12a7bf4e2ee9f95c389c590e3d458071
2020-03-19 02:52:30 +00:00
TreeHugger Robot
dde6e031f7 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
Change-Id: Id07e6022613be6dd8a34d25d1004bb15fe52b0cd
2020-03-19 02:52:01 +00:00
Treehugger Robot
3c7945a851 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours am: 1b4e1dc57e -s ours am: 325d9aeab4 -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: If78bd4916a3e4421b9202a433d19885cdcecec5a
2020-03-19 02:50:40 +00:00
TreeHugger Robot
c114c5b59d Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev 2020-03-19 02:36:55 +00:00
Treehugger Robot
325d9aeab4 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours am: 1b4e1dc57e -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: If74482eeecc39bc35a725d8c0f6dd5b237cd086a
2020-03-19 02:14:48 +00:00
Treehugger Robot
1b4e1dc57e [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: I1f8a784778d0130c683d9d759cee3cf266b8ae08
2020-03-19 02:06:59 +00:00