PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,844 Commits 1 Branch 0 Tags
1b03baa6e84545332ce454e710835810a5cb1542
Commit Graph

61844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1b03baa6e8 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 am: 4731f3c571 am: 33b978d2e7 am: 5d8e8ba402 
Change-Id: I1f36e941074a020c253793a3fc1b673c6216b9d9
 2020-03-19 08:50:41 +00:00
TreeHugger Robot
5d8e8ba402 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 am: 4731f3c571 am: 33b978d2e7 
Change-Id: Ic97fd78976c036b72b84721d8eff8838e79f9841
 2020-03-19 08:26:32 +00:00
TreeHugger Robot
33b978d2e7 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 am: 4731f3c571 
Change-Id: I50ef65372f59877593ea4d5d10c26b4db715867f
 2020-03-19 08:05:27 +00:00
TreeHugger Robot
4731f3c571 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44 
Change-Id: If8a9610b3d12eeff785d09b17731bb114c85cd68
 2020-03-19 07:45:46 +00:00
TreeHugger Robot
f210cf3c44 Merge "Tweak string for Display over other apps" into rvc-dev 2020-03-19 07:26:03 +00:00
tim peng
bf722fe84c Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 82681292f4 am: 22db0fa631 am: d4dec44df4 
Change-Id: Ia00a962b4e5576d3867dbfeb157b04e45b9bd1da
 2020-03-19 07:16:44 +00:00
tim peng
0d759d9eac Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 8e8ac25c41 am: 1531ccc5a2 am: 0dd3951f69 
Change-Id: Ib7fdc166046abab0511f1f58a4f16f56ea687804
 2020-03-19 07:15:08 +00:00
tim peng
d4dec44df4 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 82681292f4 am: 22db0fa631 
Change-Id: I381583a9000f100f41dd7fafeae60b19445fc7c6
 2020-03-19 07:11:04 +00:00
tim peng
b437f1b7e4 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 65c0fd1747 am: 5ecb29d9aa 
Change-Id: I0cbe73e5fac981148574980656cf415644fbd50a
 2020-03-19 07:10:58 +00:00
tim peng
0dd3951f69 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 8e8ac25c41 am: 1531ccc5a2 
Change-Id: Id8b0911eb5dc596ddbaebc02d526afc47a02cfe9
 2020-03-19 07:00:23 +00:00
tim peng
5ecb29d9aa Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 65c0fd1747 
Change-Id: Ib5527f9bf5ee3de6280d173cb0ccf38af38cb195
 2020-03-19 07:00:10 +00:00
tim peng
22db0fa631 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 82681292f4 
Change-Id: Id04cd7c0f900c06327065cbbb2b944cd8dbee965
 2020-03-19 06:55:51 +00:00
tim peng
1531ccc5a2 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 8e8ac25c41 
Change-Id: Ib67b9ebcf09e87fb53eee0f3b267ed7d79395036
 2020-03-19 06:41:06 +00:00
tim peng
82681292f4 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 
Change-Id: Ib8761ac0a48879ef463706812d75ffcf6c73e7a6
 2020-03-19 06:41:05 +00:00
tim peng
65c0fd1747 Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 
Change-Id: Ie9461236f3f801f1eaa6c07420829f51d680fc72
 2020-03-19 06:40:38 +00:00
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
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