Bill Yi
9848b647f7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
2p: 58d731dd8e
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I63447d82f5c59bb689e4977929af79901c4ca8eb
2021-10-02 04:43:09 +00:00
Bill Yi
58d731dd8e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: Ie6c0c856bec1c105543c0009f3e95663a821326d
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
Bonian Chen
b74ccf7f33
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- reduce number of accessing to isWorldMode()
Bug: 201757298
Test: presubmit pass
Change-Id: I710255887b5ba8038c3faf5471a88a02a15c015e
2021-10-01 13:32:57 +00:00
Bonian Chen
bc02a2d939
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- move isWorldMode() detection to the first line
within shouldSpeciallyUpdateGsmCdma()
Bug: 201757298
Test: presubmit pass
Change-Id: Iccffca52b2e0e48ff62ec749c0cf3faa273b0e18
2021-10-01 11:18:36 +00:00
TreeHugger Robot
06d312f0af
Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34
am: d9195b80af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356
Change-Id: I3b030dd9ac65b93500814b62cae4ef48ceb3bc1b
2021-10-01 08:58:55 +00:00
TreeHugger Robot
d9195b80af
Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356
Change-Id: I0c3c6b03e522c7320387253b0bd4546b6409b641
2021-10-01 08:43:07 +00:00
TreeHugger Robot
99554d3c34
Merge "Punt battery status action when entering Settings main page" into sc-v2-dev
2021-10-01 08:34:35 +00:00
Wesley.CW Wang
0cd29a70a4
Punt battery status action when entering Settings main page
...
- Checking battery sharing states at the beging may have some performance issue, post battery status update to background thread to avoid ANR
Bug: 193600924
Test: make SettingsRoboTests
Change-Id: I3b73e6bd4f952bc832783b9b3b5d45db560d088c
2021-10-01 15:15:25 +08:00
TreeHugger Robot
2f57f40072
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: a214347698
am: 261ab7a07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I34e2890e8391f8582cb851d149a0eb24547a6a26
2021-09-30 19:54:57 +00:00
TreeHugger Robot
3ed8f333fc
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: bed34d70fb
am: f695f7790e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I0bff5a7d2f9d1267f030c2d8ba7065dd906dbf0a
2021-09-30 19:54:37 +00:00
TreeHugger Robot
a347bf9836
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
am: f00be6bdfc
am: 68636fecf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Iaa9cca7e41305a9161f97e5dd8181ef3824c403a
2021-09-30 19:54:10 +00:00
TreeHugger Robot
261ab7a07e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: a214347698
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I2ff7d271ecbb1832e772bb93ac2381d0ec2228d5
2021-09-30 19:40:55 +00:00
TreeHugger Robot
f695f7790e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: bed34d70fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ic44876c0fa7a6a179e8d8b3876d515e8aa4db202
2021-09-30 19:40:33 +00:00
TreeHugger Robot
68636fecf7
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
am: f00be6bdfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I7a1067e4d2c7ff8af697b9e65304f6cf7b34ba5d
2021-09-30 19:40:20 +00:00
TreeHugger Robot
a214347698
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I8c227ad10956e94c1feb3d019bafe88f65c4116a
2021-09-30 19:23:24 +00:00
TreeHugger Robot
bed34d70fb
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia0111381dc70bb1b4d73ff337fb2e303b52d8b48
2021-09-30 19:23:22 +00:00
TreeHugger Robot
f00be6bdfc
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Idd67e658def711bd9c63f24dfda05dedb989d795
2021-09-30 19:22:59 +00:00
TreeHugger Robot
4d966f38e4
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 0063fd58c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ie3451fc541adf1d92f790de9a723748ab3aaa43c
2021-09-30 19:22:32 +00:00
TreeHugger Robot
cddd334ee6
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
2021-09-30 19:06:45 +00:00
TreeHugger Robot
0063fd58c1
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ice80370ec530e25aff4c67d7d42ac61f221c09df
2021-09-30 19:05:58 +00:00
TreeHugger Robot
9a573b1942
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Id94319ec70f89a5f153d4e7f6db9ed2cba036997
2021-09-30 19:05:51 +00:00
TreeHugger Robot
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +00:00
TreeHugger Robot
403ee0c762
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: b75781c7bc
am: 0cb180e6a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I3cd1f09db09ee6e07d18fe81bb8d4cd467acf145
2021-09-30 12:47:59 +00:00
TreeHugger Robot
7532914bb1
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: 0db131b42b
am: a3272a14be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: Ic404a67114e2f746a37ab44469aeafc705635eda
2021-09-30 12:47:30 +00:00
TreeHugger Robot
0cb180e6a3
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: b75781c7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: If82810ee40918bc379631b426343c5909f7a6d8e
2021-09-30 12:34:11 +00:00
TreeHugger Robot
a3272a14be
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: 0db131b42b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I56205568bc623b726ae074bdc421187c5bdb1c1e
2021-09-30 12:33:35 +00:00
TreeHugger Robot
0db131b42b
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I152a4223fbbf0ceaadfab992dc14bce46af763cd
2021-09-30 12:21:45 +00:00
TreeHugger Robot
b75781c7bc
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I4db07fe42154f484d9918096949427aa8569744d
2021-09-30 12:21:44 +00:00
TreeHugger Robot
7ba545d992
Merge "Fix USB tether option" into sc-qpr1-dev
2021-09-30 12:06:41 +00:00
Arc Wang
a6e71bdbfa
Use startActivity for android.settings.APP_SEARCH_SETTINGS am: 407a725278
am: 6d6a1b136a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939310
Change-Id: I460366fd2e6198a6290082d9268f87ba8be1a48c
2021-09-30 02:23:08 +00:00
Arc Wang
6d6a1b136a
Use startActivity for android.settings.APP_SEARCH_SETTINGS am: 407a725278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939310
Change-Id: I3dda7d8dbaf171c8aafad18a86425af3205ef060
2021-09-30 02:06:25 +00:00
Arc Wang
407a725278
Use startActivity for android.settings.APP_SEARCH_SETTINGS
...
The Activity launched by android.settings.APP_SEARCH_SETTINGS
does not setResult. So it's no meaning to use
startActivityForResult for the Intent.
Bug: 196923591
Test: manual
Settings -> Search settings -> search an item ->
click back button twice and back to Settings home.
Change-Id: Ia760a301465bb87814326611a1ec2368887f120a
2021-09-30 01:52:48 +00:00
Bill Yi
1498e0dc32
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77
am: 81d0121ce0
am: 48865e78b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I23c8eeb58d2a17504819d64d373ef8ba347b21ea
2021-09-29 17:51:43 +00:00
Bill Yi
121882a54b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: a27f0eaf3d
-s ours am: 88bf3f3238
-s ours am: 25596468ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I0886e87e35fc89892793e5dbb7d271588e9f7dd9
2021-09-29 17:51:40 +00:00
TreeHugger Robot
b1e4442072
Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev am: 9a7d259341
am: cfb043298c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926635
Change-Id: Id7ea23b0404d0cf2e571fa4d98c1a86349659d41
2021-09-29 17:50:11 +00:00
Bill Yi
c2808253cf
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77
am: 579e3fece3
am: 6199884a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I898667810fa6384eceb8de450c8bc0fe041b3eac
2021-09-29 17:48:35 +00:00
Bill Yi
c08152f333
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: a27f0eaf3d
-s ours am: aa7fb69d3c
-s ours am: 35763a75c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I5ff05edede67824988d7fdca30ab4904f52c87fb
2021-09-29 17:48:33 +00:00
Bill Yi
a725c72dae
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee
am: e6c645a44d
am: 71a71624b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I5dff000dacb84182ca8304742a021398fefb11f0
2021-09-29 17:46:28 +00:00
Bill Yi
a52539abae
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: 43b9cb669c
-s ours am: 8c9a83328b
-s ours am: 0780c5901e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: Ibed432862fce4beb7a0bfa1f9eee84db5a2f2235
2021-09-29 17:46:24 +00:00
Bill Yi
48865e78b9
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77
am: 81d0121ce0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: Iff5107f1d5ad6cb3e66889827ea8be6e37399503
2021-09-29 17:41:03 +00:00
Bill Yi
25596468ae
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: a27f0eaf3d
-s ours am: 88bf3f3238
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: Ifcf815a4f07040ca398164f725c9a9e494b0dcf9
2021-09-29 17:40:59 +00:00
TreeHugger Robot
cfb043298c
Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev am: 9a7d259341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926635
Change-Id: I0f2bcc51715a3829508539f2adab949efcd83a65
2021-09-29 17:36:57 +00:00
Bill Yi
6199884a88
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77
am: 579e3fece3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I79b6f813027bab8326e876a89fee9ad08ba92e73
2021-09-29 17:35:58 +00:00
Bill Yi
35763a75c7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: a27f0eaf3d
-s ours am: aa7fb69d3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I6038d4305b97935422ef70a09c2f01307197b4b9
2021-09-29 17:35:56 +00:00
Bill Yi
71a71624b3
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee
am: e6c645a44d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: Ie320bcc2c82a7fc9a3b4c87b3e6d146d20cd4784
2021-09-29 17:35:11 +00:00
Bill Yi
0780c5901e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: 43b9cb669c
-s ours am: 8c9a83328b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I6a4d6dc8935a3e9c4c8e0ca184266c73485a3107
2021-09-29 17:35:09 +00:00
TreeHugger Robot
9a7d259341
Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev
2021-09-29 17:33:23 +00:00
Bill Yi
579e3fece3
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I7ddc08c6517f03cf6b333f76fb44939bfeac96ef
2021-09-29 17:24:32 +00:00
Bill Yi
aa7fb69d3c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
am: a27f0eaf3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I7d1e135cb86d0541a541745f6ffd9ecd38ebe158
2021-09-29 17:24:31 +00:00