PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,197 Commits 1 Branch 0 Tags
e501cd2a91a3b6cb494b2f8304547fc8cd7b6cb5
Commit Graph

70197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
e501cd2a91 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours am: 309cd83703 -s ours 
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: Iba75d964901531cb32ac386064be3a59af81ae7b
 2020-08-06 16:54:36 +00:00
Bonian Chen
fb8293a152 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours 
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546

Change-Id: I25ab1624f08db239b6d0783aa580722a649804db
 2020-08-06 16:54:14 +00:00
Bonian Chen
b77aaf8055 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours 
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
 2020-08-06 16:53:03 +00:00
Bonian Chen
8f8468fd08 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours 
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157

Change-Id: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
 2020-08-06 16:51:16 +00:00
Xin Li
ff75eec671 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I71a23041e53c6f666bcba7360f07917fdbcab96b
 2020-08-06 16:48:26 +00:00
Bonian Chen
309cd83703 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours 
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: I5785c59cc57f97c35202c642716be82e9c375f47
 2020-08-06 16:36:04 +00:00
Bonian Chen
db44ed63d8 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours 
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546

Change-Id: I872d489107430b37a8123482a1a12474cb5226ce
 2020-08-06 16:35:47 +00:00
Bonian Chen
4486da9ea9 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours 
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5
 2020-08-06 16:35:39 +00:00
Bonian Chen
339c352ac3 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours 
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157

Change-Id: Ibf4937b0c5da38d7102def87014b475e01b6cc55
 2020-08-06 16:35:21 +00:00
Xin Li
c9e538e9da Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: Idcf8e17d4ace8b00c4a8c76c25e25840ae880874
 2020-08-06 16:22:27 +00:00
Bonian Chen
5b79ed5ffa [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours 
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: I57ea4371d2effc3fd4a1ee9faac999014696599c
 2020-08-06 16:06:35 +00:00
Bonian Chen
45bd473128 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours 
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546

Change-Id: Id49648216c4f5d251c3fe1d817904d66aca04237
 2020-08-06 16:05:56 +00:00
Bonian Chen
f9803fc6c2 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours 
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: I2c9008cb50c9de6a36eefa1aa2a20268696628ce
 2020-08-06 16:05:36 +00:00
Bonian Chen
e60cb2f67b [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours 
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157

Change-Id: Ibb8c7d6fa353f6e6036ed355a9a24490b181cb5d
 2020-08-06 16:03:52 +00:00
Xin Li
761d56988b Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I185588633bf511b2389c2f69cf35717ae6d746a6
 2020-08-06 16:02:18 +00:00
Bonian Chen
94bce5c6dd Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 am: ce917cbad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: I9aa360b4545d71bc8149a6b1ef271123ff0843b9
 2020-08-06 11:40:33 +00:00
Bonian Chen
9b08bbac0f Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 am: 64e70d916d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: I7fe5607853940a426e05061e3b1ced7a55f389b6
 2020-08-06 11:39:23 +00:00
Bonian Chen
ce917cbad0 Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: I8a3f2baa2d505eaf3e61ad1a5e4022d3b70e0638
 2020-08-06 11:23:11 +00:00
Bonian Chen
64e70d916d Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: Ia8c30b0ff0fcbe4720264105edf8c7ad16353b5a
 2020-08-06 11:21:50 +00:00
Bonian Chen
65575cfb66 Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev 2020-08-06 11:04:29 +00:00
Bonian Chen
fc47bff681 Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: I69cb17780ba0a519420557977398c2f86cda1118
 2020-08-06 04:41:30 +00:00
Bonian Chen
96533385f0 Merge "[Settings] Access ProxySubscriptionManager within DataUsage" 2020-08-06 04:21:45 +00:00
Bonian Chen
44fbf04469 Merge "Remove useless png and add vector drawable" am: 0cfec664c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546

Change-Id: I6875e7a5e7b41b178f54999b49b346f62d4bcb6a
 2020-08-06 03:32:18 +00:00
Bonian Chen
0a1d15530b Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: Ibcaea10f983975809aa97635239f3b6850a22e9c
 2020-08-06 03:32:07 +00:00
Bonian Chen
0cfec664c4 Merge "Remove useless png and add vector drawable" 2020-08-06 03:11:56 +00:00
Bonian Chen
75b3666b02 Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" 2020-08-06 03:11:21 +00:00
changbetty
f1a52da792 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline 
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Merged-In: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
Change-Id: Idca7a76c591448a45ecc33cb392f416c70d32f91
 2020-08-06 09:14:58 +08:00
Raff Tsai
cbd234e1c1 Remove useless png and add vector drawable 
Bug: 139336138
Test: visual
Merged-In: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
Change-Id: If7de9126c8afab3422999db66ad9b7a179334f10
 2020-08-06 09:03:32 +08:00
Bonian Chen
f42a022a8f Merge "Look up CBS package name through PackageManager." am: e24a23f9ab 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157

Change-Id: I051cd4ac15732c3fa4e5b93ee2af768fcfd21956
 2020-08-05 23:03:03 +00:00
Bonian Chen
e24a23f9ab Merge "Look up CBS package name through PackageManager." 2020-08-05 22:44:23 +00:00
Xin Li
dcaeff56e3 Merge "Merge QQ3A.200805.001" am: cded32987b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I36aaf8b9f26c71377d1c6c64396e2eb5cb2114bb
 2020-08-05 21:19:11 +00:00
Xin Li
cded32987b Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
TreeHugger Robot
1206fa90b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 39297cbc9a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12316569

Change-Id: Ic26d1bf156914ecfc35139d635bbd6b9403e1f2d
 2020-08-05 20:25:48 +00:00
TreeHugger Robot
39297cbc9a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-05 20:08:28 +00:00
TreeHugger Robot
a85027b54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 97111a5b06 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315580

Change-Id: If9fd6544fa4aff7cad11b130e2ef4656d6b8ee5d
 2020-08-05 16:45:19 +00:00
TreeHugger Robot
c650b43096 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 66de015218 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315580

Change-Id: I75d51f715fac716c220cf0ce0bf788e16334c1c0
 2020-08-05 16:44:07 +00:00
TreeHugger Robot
97111a5b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315580

Change-Id: Ieeba808f8bdd5411d905ff4413d4a8813179a709
 2020-08-05 16:22:41 +00:00
TreeHugger Robot
66de015218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315580

Change-Id: I955b425cf9235fe2e41e036109cd7ccfe8648ac3
 2020-08-05 16:21:25 +00:00
TreeHugger Robot
03521b9303 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-05 16:10:14 +00:00
Bill Yi
4c876eca6d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I357bb95fca88b3534eec4167af19267202cf3f8e
 2020-08-05 15:08:08 +00:00
Bonian Chen
12c22d8066 [Settings] Access ProxySubscriptionManager within DataUsage 
Redirect some SubscriptionManager access to ProxySubscriptionManager.
This will reduce some access latency.

Bug: 141833767
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Merged-In: I2cb30dd0570a09543a13ca01cf054ba2d18d70d4
Change-Id: I536b45fd5ddd5d9d9591a133a0f79227a670d7dd
 2020-08-05 23:04:45 +08:00
Bill Yi
a11a26cdbf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I54e58debc730f1459809075a2c0cabc411ebce6e
 2020-08-05 14:33:42 +00:00
Amit Mahajan
42d1d4be6b Look up CBS package name through PackageManager. 
Instead of hardcoding it.

Test: manual
Bug: 154436403
Merged-In: I0feb356e6cd4868f71198bdee49a7658b4b98b5d
Change-Id: I9b3b3464614eac7394434e55eb142bc1053e8758
 2020-08-05 21:58:45 +08:00
Bonian Chen
1fadfc451c [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours am: e1d58f6977 -s ours 
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I486c5f5becc1e4c624f1c74a17dccd5eb2fe490c
 2020-08-05 10:15:07 +00:00
Bonian Chen
9283706109 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours am: 5c1fbcc7d1 -s ours 
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128

Change-Id: Ie6f2aeb9d71bd96f00b5c592a4a483e69e2041aa
 2020-08-05 10:14:48 +00:00
Bonian Chen
e1d58f6977 [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours 
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I974456eb70254ce7289056b21e361004d9e753f0
 2020-08-05 09:57:29 +00:00
Bonian Chen
5c1fbcc7d1 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours 
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128

Change-Id: Ia80619e1f81201331d7168cb2c0ceb76c10792a6
 2020-08-05 09:57:16 +00:00
Bonian Chen
009f7ec40d [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours 
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I7b4659c785548541a4062c4336b31b7e6b8e3ed3
 2020-08-05 09:38:25 +00:00
Bonian Chen
4cd2283768 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours 
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128

Change-Id: I63570338e4a096b494917f3bff58071e609c545f
 2020-08-05 09:38:12 +00:00
Bonian Chen
f257197d96 Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I7754cefefd1224608fe879c36e00307d6777bc79
 2020-08-05 09:20:21 +00:00