menghanli
e488927e34
Fix wrong glifLayout padding for tablet resolution
...
Root cause: Override the padding by phone padding to caues inconsisstent
behahvior.
Solution: Remove the attributes
Bug: 229106829
Test: Manual testing in t6 (tablet) and raven (phone)
Change-Id: I583626a00088d36bda311087e8830f47e49a1152
2022-04-19 13:36:45 +08:00
Milton Wu
a4f30404f0
Not relaunch BiometricEnrollActivity durng SUW
...
Biometric fingerprint flow is abnormal because BiometricEnrollActivity
is relaunched during SUW because diplay or orientation is changed.
Bug: 205059704
Bug: 228812876
Test: atest BiometricEnrollActivityTest
Test: Before clicking "No thanks" manully unfold or rotate device on the
fingerprint setup screen of SUW
Change-Id: If0abe785c74c7fb40da779af166d79eeba6ad57f
2022-04-19 03:48:22 +00:00
TreeHugger Robot
b1bdc42d52
Merge "Read CarrierConfig to get operator name" into tm-dev
2022-04-19 02:08:35 +00:00
Hugh Chen
abad3c4a88
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev
2022-04-19 01:56:59 +00:00
Bill Yi
c88b882013
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I647d7ed44ee15b1c55ae97993b5c15ab16157438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:46:10 +00:00
Bill Yi
5e99e584f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Ie8c3416a031f791d4e4603c39aea24932c835360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:46:08 +00:00
Bill Yi
9d597ae5b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: I9f6767d2a7e0cadb67eb58cb0464880acfbcc6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:45:44 +00:00
Bill Yi
052970997d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-19 00:27:54 +00:00
Bill Yi
b9dd1a3a2d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-19 00:22:17 +00:00
TreeHugger Robot
db7228fd26
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-19 00:17:15 +00:00
menghanli
7ae0b641dd
Fix transparency seekbar is enabled while fade feature is disabled.
...
Root cause: Show default status until setting key changed. It does not
show latest status when created.
Solution: Update the status when created.
Bug: 229566130
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FloatingMenuTransparencyPreferenceControllerTest
Change-Id: Ia25fe5cec0444c1771e8ce31aae2a4cb3b0405a1
2022-04-19 08:15:28 +08:00
Xin Li
024fe4b39a
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671
Change-Id: Ia9158c51f249227851e314b45566de1f7bfec848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:08:18 +00:00
Niklas Lindgren
8bc83ef615
Read CarrierConfig to get operator name
...
Config if operator name should be in status bar is now read
from carrier config. For dual sim devices we use data sim.
Bug: 116847905
Test: Add item for carrier in vendor.xml and swap sim cards
between ones that have the item enabled and disabled. We have
also tested to swap data sim cards on dual sim device.
Test: m RunSettingsRoboTests ROBOTEST_FILTER="ShowOperatorNamePreferenceControllerTest"
Change-Id: I03311b96ee660aed80ec867b05aa0a34cfc15f54
2022-04-18 21:34:57 +00:00
Xin Li
99d834b0b8
Merge sc-v2-dev-plus-aosp-without-vendor@8433047
...
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
2022-04-18 21:01:08 +00:00
TreeHugger Robot
467b85d088
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:51:14 +00:00
TreeHugger Robot
5e411c38cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-18 18:14:25 +00:00
TreeHugger Robot
aa1f86f18d
Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
Import translations. DO NOT MERGE ANYWHERE
2022-04-18 18:14:25 +00:00
Bill Yi
6c46c20518
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801766
Change-Id: I5fbaef29db47314d259051001fc284f01b627229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:00:04 +00:00
Peiyong Lin
bd26c3c747
Merge "Clean up extra app info." into tm-dev
2022-04-18 17:37:41 +00:00
Yuri Lin
a73c850aa5
Merge "Special handling for intent coming from "welcome" notification." into tm-dev
2022-04-18 17:09:02 +00:00
Hugh Chen
aadc44ae26
Fix default usb settings will set wrong function when onPause()
...
Bug: 229200265
Test: make -j64 RunSettingsRoboTests
Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe
2022-04-18 12:16:57 +00:00
Bill Yi
64a0937f54
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7d7f009e6a1f4698d7d302ce3440b60f679e672
2022-04-18 10:57:25 +00:00
Bill Yi
442f62eb55
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69867d36d9dfef29de295def3477ccd9222b24da
2022-04-18 10:42:59 +00:00
Bill Yi
fc86f72e65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7d547343a1ce1a358b12ab082db4378d88b67c14
2022-04-18 10:36:04 +00:00
Bill Yi
fb20f3183b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I0c632c34915f66123287353900d59d4e31010a25
2022-04-18 10:32:54 +00:00
Bill Yi
d5de2ec5ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4034c0729c04a0a0dd7a3d3690303c616e67516
2022-04-18 10:32:41 +00:00
Bill Lin
f5496a99cd
Remove redundant margin from SudContentFrame
...
Test: make and diff screen
Bug: 229197953
Change-Id: I8d4de113ba69ee72b0eb36ad95ae395afa6eab11
2022-04-18 17:47:50 +08:00
TreeHugger Robot
708c2d2fd5
Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev
2022-04-18 08:20:48 +00:00
Edgar Wang
4dc79d92f0
Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev
2022-04-18 06:45:02 +00:00
ykhung
0f8ee91e1e
Remove the legacy getReplacingActivity() method from feature provider
...
Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: Ie7ae30ad671ec2ee2659e64ee4f191728edab4e8
2022-04-18 05:59:58 +00:00
Edgar Wang
ca7f11d965
Adjust the padding between profile tab and app filter spinner
...
Bug: 223952727
Test: visual
Change-Id: I88411d554975953d29a24a88b6cf948f7f6d7ac8
2022-04-18 12:48:35 +08:00
TreeHugger Robot
edf39d0e45
Merge "Fix sub status of LocationSettings" into tm-dev
2022-04-18 04:20:09 +00:00
Hugh Chen
3c354a2d38
Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev
2022-04-18 01:50:07 +00:00
Chaohui Wang
37375565e5
Fix sub status of LocationSettings
...
Fix the followings:
Recent access apps are not displayed after toggling off/on
"Use location".
When "Use location" is enabled, "Location for work profile" switch is
disable and gray out.
Fix: 227621199
Fix: 227265216
Test: manual
Change-Id: I9f955a381827eb020fbd0d6ebeb9fced3dec1dcf
2022-04-17 19:38:39 +08:00
ykhung
91adbd3b16
Use en-dash in the time range instead of a hyphen for different format
...
Expected format: 00:00–02:00 or (2pm – 4pm)
Screenshots:
https://screenshot.googleplex.com/4RvaovK6RN7kjqo
https://screenshot.googleplex.com/ADZRr2TPuuctFre
Bug: 229264053
Test: make RunSettingsRoboTests
Change-Id: Ifd9bea0ce4525c8b582778e255104e875d365563
2022-04-17 06:52:24 +00:00
ykhung
b593e00af0
Format BatteryEntry and BatteryDiffEntry class
...
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
2022-04-17 06:23:47 +00:00
Bill Yi
afa4a259d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e709cfb3984b5110869cbedb5d27a43ea7299fb
2022-04-17 04:36:18 +00:00
Bill Yi
713df54284
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie2f06fafcafd8eb46fd5e53a8b489eb41cca4997
2022-04-17 04:32:46 +00:00
Peiyong Lin
586bcd69d9
Clean up extra app info.
...
Bug: b/224595815, b/229336010
Test: manual
Change-Id: I21cda5a4a5f8f378a532ac0fd4e91c2cc011ed95
2022-04-16 00:47:05 +00:00
YK Hung
c4801433d9
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev
2022-04-15 13:06:04 +00:00
TreeHugger Robot
36414eab28
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev
2022-04-15 11:47:55 +00:00
ykhung
1c6695951f
Use the custom name in the battery attribution if it is unknown item
...
Keep the queried name is null to use the custom provided battery attribution name (avoid to replace it with POWER_COMPONENT_ prefix name), such that we can show "TPU", "GPU" ... attribution.
old screenshot: https://screenshot.googleplex.com/8KGNxW2eHFY85zw
new screenshot: https://screenshot.googleplex.com/8KVj3jBjShfa8wK
Bug: 227749579
Test: make RunSettingsRoboTests
Change-Id: I22fba3c252a92f7d64670ad5d0f6f3548374968a
2022-04-15 11:20:46 +00:00
Chaohui Wang
fdc32b765d
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev
2022-04-15 09:55:48 +00:00
Hugh Chen
e9864510ab
Change "Previously connected devices" string to "Saved devices"
...
Bug: 215230194
Test: local test
Change-Id: I0ae7f71b798f5582ff62f20ce639133242c30b3f
2022-04-15 09:51:30 +00:00
SongFerng Wang
9b6c604742
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466
am: 3b66c18d75
am: 6296df10da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: I2b87ec33acef3ff86422ac715a30973fa6fd837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:42:48 +00:00
SongFerng Wang
6296df10da
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466
am: 3b66c18d75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: Ib36f32c745b571d18e09e2a5f5ae81220e441fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:22:54 +00:00
SongFerng Wang
3b66c18d75
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: Ie05c32e8c7d358d4cfad14cee4dc5f8849384d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:06:58 +00:00
SongFerng Wang
48967e6466
Merge "[LE unicast] Change the default value for LeContactSharingEnabled"
2022-04-15 07:23:39 +00:00
SongFerngWang
b50430e09d
[LE unicast] Change the default value for LeContactSharingEnabled
...
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
2022-04-15 15:19:17 +08:00
ykhung
e431df2036
Remove singeLine attribute in the usage chart divider
...
Remove the android:singleLine attribute in the expand divider layout to support other language to avoid the content is truncated.
old screenshot: https://screenshot.googleplex.com/7JCnrQAXJM8zjMM
Bug: 229265247
Test: N/A
Change-Id: I9038e69a9ab035b4e0599ca20e11fbccd471f76f
2022-04-15 07:00:57 +00:00