Bill Yi
de3754f4bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747500
Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
2021-09-03 17:15:14 +00:00
TreeHugger Robot
4d237e36d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747957
Change-Id: I7afb74d01977622f0e510a73ef300d255a18d273
2021-09-03 17:02:49 +00:00
TreeHugger Robot
0ce2aee04b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748131
Change-Id: Ifbb867e713d9ea9b71b8ee8e2412b63575cc5ba3
2021-09-03 17:02:12 +00:00
TreeHugger Robot
f1780afb1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-09-03 16:50:43 +00:00
TreeHugger Robot
a64f9f261b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:47:06 +00:00
TreeHugger Robot
76af5ca27c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:46:41 +00:00
YUKAI HUNG
bfb214953e
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: If14c84483416d18deb8b71db1750eeb89168a221
2021-09-03 07:52:46 +00:00
YUKAI HUNG
32e61bbeb7
Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev
2021-09-03 07:33:29 +00:00
changbetty
8dec2efc67
Change the SIM color for passing the GAR
...
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
YUKAI HUNG
8d49d45f1e
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ic2216021eb520273518a6ba7f91fc8b52ecdbfef
2021-09-03 03:03:46 +00:00
YUKAI HUNG
0051f1e3e9
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I760b2d0d9a85b271c6a11c0d0255a164d5aba6dc
2021-09-03 02:58:37 +00:00
YUKAI HUNG
0a11568b82
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ie57e3be9bda2316a8ee6a59fba76043ed6e61c54
2021-09-03 02:50:11 +00:00
YUKAI HUNG
fab65bcfe5
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
2021-09-03 02:48:48 +00:00
YUKAI HUNG
3f1d329878
Merge "Hide Camera background running time in the battery usage screen" into sc-dev
2021-09-03 02:33:22 +00:00
Bill Yi
4a0398c888
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I76a03c3361848e96d981867535cb1c987ffc410f
2021-09-02 13:45:37 +00:00
Bill Yi
8b34aa6114
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I6a79b22222a59807c26431c6a321cac377d599c2
2021-09-02 13:42:07 +00:00
Bill Yi
78c0f840f7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I11ad2115f0880746355ebc438586a606c5a0cc7a
2021-09-02 13:42:07 +00:00
Bill Yi
1336ffec20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
2021-09-02 13:41:52 +00:00
Bill Yi
71904cfc78
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d02ac4cb07e74c28f89f88f0048068ac5ecfaba
2021-09-02 13:32:52 +00:00
Bill Yi
914dc714a2
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I2255e2a4c1e9ad286e4e9d7c956bcd6c6ede66d0
2021-09-02 13:31:27 +00:00
Bill Yi
fefa801325
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: Id0c33c816383e6f8336bac7c1f4a8a065df86f5d
2021-09-02 13:31:27 +00:00
Bill Yi
fb4f0b0820
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
2021-09-02 13:31:17 +00:00
Bill Yi
8382ada407
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
2021-09-02 13:23:16 +00:00
Bill Yi
c71f1a2fce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib76b04af514d6c2179f8f56a4e1ef47885e595cc
2021-09-02 13:11:52 +00:00
Bill Yi
4f514d351e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I964e86741a41b4135f26b107e2ce0cbe713a463d
2021-09-02 13:06:49 +00:00
Treehugger Robot
e81eb6bd40
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
am: fb1bf5f85e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I11c518f21390017a8aa93e8c201ecc3da752b5c1
2021-09-02 09:38:25 +00:00
Treehugger Robot
fb1bf5f85e
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
2021-09-02 09:25:52 +00:00
Treehugger Robot
6eb3f3bf90
Merge "Support multi-users for NFC payments" am: 6eb702ed63
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
2021-09-02 09:17:20 +00:00
Treehugger Robot
6eb702ed63
Merge "Support multi-users for NFC payments"
2021-09-02 08:56:28 +00:00
Android Build Coastguard Worker
0bcc5ff4c2
Snap for 7695811 from f25a00217c
to sc-qpr1-release
...
Change-Id: I8a9149eda93b8479f9e228fda48212b0159d67b1
2021-09-02 01:10:41 +00:00
Zoey Chen
2d827ddf50
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: Ie210682def804b99f21e3803d95c4d14828af77c
2021-09-01 04:12:08 +00:00
Zoey Chen
f25a00217c
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev
2021-09-01 03:58:13 +00:00
Joe Bolinger
9133578aaa
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: bc188f609c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: Ia27a78476731d285774ca6640414c3670a031d36
2021-09-01 01:43:36 +00:00
Joe Bolinger
95626d62f3
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: 46470d911e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: Idaec22cc49b17bc088380ec4da7ce51e2f037856
2021-09-01 01:43:26 +00:00
Joe Bolinger
bc188f609c
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: Ifd9ebd5877ce8020c0c977db8f6744c03ca24c70
2021-09-01 01:26:40 +00:00
Joe Bolinger
46470d911e
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
2021-09-01 01:25:27 +00:00
Joe Bolinger
c7a0b63dd9
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev
2021-09-01 01:15:40 +00:00
Android Build Coastguard Worker
235ea2c228
Snap for 7692139 from 736bce563e
to sc-qpr1-release
...
Change-Id: Ie3e941e4ffc21bd65b88b59467801aecc0038103
2021-09-01 01:07:39 +00:00
TreeHugger Robot
0164a3a724
Merge "Log when DEBUG is on" into sc-qpr1-dev am: 736bce563e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15598813
Change-Id: I527bfca7a4397af216b2abd2b04ab157d1ad1adf
2021-08-31 22:40:47 +00:00
TreeHugger Robot
736bce563e
Merge "Log when DEBUG is on" into sc-qpr1-dev
2021-08-31 22:19:19 +00:00
Zoey Chen
35803a3b03
[Provider Model] Add a cutout for signal icon if the mobilde data is disabled
...
Screenshot: https://screenshot.googleplex.com/57wPkj9pq9hP5WA.png
Bug: 198233143
Test: manual, atest SubscriptionsPreferenceControllerTest
Change-Id: I3caefc7e1ca10dadcad114273edf35d9309502e1
2021-08-31 16:03:23 +00:00
ykhung
4e3f692164
Hide Camera background running time in the battery usage screen
...
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background
Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
2021-08-31 13:58:13 +00:00
Ting Yu
f56682808e
Fix Text of VoLTE setting cannot be updated when SIM state is changed
...
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.
Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.
Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.
Test: manual
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
2021-08-31 20:14:20 +08:00
Hugh Chen
ffeefd4d11
Fix USB tethering is not turned on with a single tap
...
Before this CL, the USB default settings will set default usb functions
to RNDIS when tethering is started. Because in some devices, the NCM
is used instead of RNDIS to start tethering. If RNDIS is set in the
device that uses NCM to start tethering, it will cause start
tethering failed.
This CL will use the current functions to set default usb functions
to fix this issue.
Bug: 195068679
Bug: 197026638
Test: make -j42 RunSettingsRoboTests
Change-Id: Ic9353c5ac76c0cd517318a4304fa214d6b2201d2
(cherry picked from commit ba30b04cc3
)
2021-08-31 09:03:07 +00:00
ykhung
ba35874594
Hide Camera background running time in the battery usage screen
...
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background
Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
2021-08-31 07:49:07 +00:00
Weng Su
dc50ca86fb
Don't show Wi-Fi icon if the level is -1 am: 1f6f807834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350
Change-Id: Ib8e3164f046f2deeca88e6d31e29058789751edc
2021-08-31 03:21:47 +00:00
Android Build Coastguard Worker
d2b9e2d6c2
Snap for 7688383 from 7514b30f06
to sc-qpr1-release
...
Change-Id: I6468e73e4ffe4332349621db4a36e353cff5a305
2021-08-31 01:08:05 +00:00
Weng Su
1f6f807834
Don't show Wi-Fi icon if the level is -1
...
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest
Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
(cherry picked from commit 7e14668094
)
Merged-In: Ifddc9aace42d1f024b7c861b1207f651061d790b
2021-08-30 22:55:26 +00:00
Bonian Chen
a4a806e4ea
[Settings] Avoid from immediate update when UI inactive and SIM absent
...
When SIM absent during UI inactive, update can be postponed under the
condition of Activity onPause() or onStop(). And update when onResume()
or onStart().
This is not simply an improvement on performance but also a better user
experience.
User might unplug a SIM and plug-in again, and there're cases where a
SIM status might change into absent and back to active again due to some
mode switch in RIL/modem. From user perspective, the SIM status remain
the same and update of content is expected instead of closing the UI and
re-enter.
Bug: 195631787
Test: local
Change-Id: I8248e59895631dc90cf3831398e387b93483280c
(cherry picked from commit b2a6266fa9
)
2021-08-30 06:56:12 +00:00