Xin Li
843b2da970
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: c5d14a8728 -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: I43f69b433b13247aa6066cd12e66f1869eb8dea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:33:21 +00:00
Xin Li
c5d14a8728
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -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: I62a0028ef31599133269dcda6631a9c19d0e9007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 05:13:28 +00:00
Xin Li
39e1357748
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -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: I129b65c2db67aa72a0f3d4de00b598e2fa64e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:47:34 +00:00
Menghan Li
4d749fca2b
Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457 am: 901c166927
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717
Change-Id: I9d28328428f5720c6059de0c03ef01aa972714ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:33:12 +00:00
Menghan Li
901c166927
Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717
Change-Id: I98e81cc16c1b4790f864ac85d31c7608f9ea13ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:07:21 +00:00
Menghan Li
4d1e327457
Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev
2022-04-20 03:36:56 +00:00
Bill Lin
93d68ac7b5
Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50 am: 3eb3923248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709
Change-Id: I54886bcc2c2464eb63fe5dd40c86a9bd3cb4bbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:56 +00:00
Arc Wang
4eafad5f36
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9 am: f94760e74c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: Ia4fe33d0b2fa089b84d19abd39d5b61db1a3b4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:50 +00:00
Bill Lin
3eb3923248
Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709
Change-Id: Ia8fc650c1cc7943b38aa8bb5d7470b9fbfb272b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:18:00 +00:00
Arc Wang
f94760e74c
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7aa4104198b2210aad9b65cb5834ebc7eb0e2784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:17:52 +00:00
Bill Lin
dc9df4db50
Merge "Remove redundant margin from SudContentFrame" into tm-dev
2022-04-20 01:15:18 +00:00
Arc Wang
96491e1ea9
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev
2022-04-20 00:54:15 +00:00
TreeHugger Robot
228c26e21a
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a am: 952408cabe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I5bb7d93944b4c2ce482e178118b59335075b36b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:47:28 +00:00
TreeHugger Robot
a5d6861390
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9 am: 3f7f5386c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I56f2d65fadf3e9a0143e55532f71501a5d804dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:32:23 +00:00
TreeHugger Robot
952408cabe
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I5bb5e77892ef34b5528a4ea2b419234da1f96350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:26 +00:00
TreeHugger Robot
3f7f5386c5
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I283f489b4422f5cbab61626214e575ac2255d25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:08 +00:00
TreeHugger Robot
883f14f01a
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev
2022-04-20 00:03:18 +00:00
TreeHugger Robot
07950adad9
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev
2022-04-19 23:44:38 +00:00
Abel Tesfaye
238b2cc721
Update auto-rotate strings/toggles for better accessibility
...
This change will update some strings for smart-auto-rotate and replace
the activity based switchbar with SettingsMainSwitchPreference. The
switchbar had to be replaced to allow the new text to appear above the main toggle.
Test: locally with flame and with resolver service enabled & disabled
Bug: 220182618
Change-Id: I4b60bf006bdde9e47b33a52c7719ec770caf5746
Merged-In: I4b60bf006bdde9e47b33a52c7719ec770caf5746
2022-04-19 21:21:34 +00:00
TreeHugger Robot
7c1f9fbbe0
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330 am: 7fe08d0272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: I0c2aac770e289d218d63d8b9d497313f91dae589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:53:10 +00:00
TreeHugger Robot
7fe08d0272
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: Ie1367eabc70bdaeace5807ba088b8092556c6137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:29:09 +00:00
TreeHugger Robot
cc27e34330
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev
2022-04-19 17:02:54 +00:00
Niklas Lindgren
87e2471ab6
Remove config_showOperatorNameInStatusBar
...
config_showOperatorNameInStatusBar has moved to
CarrierConfigManager.KEY_SHOW_OPERATOR_NAME_IN_STATUSBAR_BOOL
Bug: 116847905
Test: Build Product
Change-Id: Ia5e7b5e498ce33ffe58ff922ab3799a1b263a88b
2022-04-19 14:21:38 +00:00
TreeHugger Robot
d3efd93dc4
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33 am: 30fb5348f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I5e8f1d2bcdf1eea55a839e10b71b0f244881e95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:57:05 +00:00
Arc Wang
ea4260c0e7
Fix ManageStoragePreferenceController always consume click event
...
ManageStoragePreferenceController should only consume click
event when its preference key matches the key of the clicked
preference.
Bug: 228970667
Test: atest ManageStoragePreferenceControllerTest
Change-Id: Ia6c62cf457fc4cadc27dc160dbd9b04ec3392d68
2022-04-19 17:35:05 +08:00
TreeHugger Robot
30fb5348f2
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: Ib3cfe231aa6a6250a7840fd187c63a64f26b7da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:34:46 +00:00
TreeHugger Robot
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +00:00
Tsung-Mao Fang
4b648f335d
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98 am: 9a8167a4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I94de281b1c0c8767dc0f3ecb59486387081bc2db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:31:11 +00:00
TreeHugger Robot
ec8c96f59e
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa am: 7c47ae926d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia54d8a9bc60bea1816c0e7dd4ab6a8796bc5daf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:59 +00:00
Tsung-Mao Fang
9a8167a4a9
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I6ce600c0e41f6457ab38478aba6b5cad8503618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:14:03 +00:00
TreeHugger Robot
7c47ae926d
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia8fb2c97f7055175085eccf58d25b54364f8a048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:13:55 +00:00
Tsung-Mao Fang
ccb8855b98
Merge "Do not expose wifi slice when no permission" into tm-dev
2022-04-19 08:12:37 +00:00
Tsung-Mao Fang
821608c5be
Do not expose wifi slice when no permission
...
Prior to this cl, slice provider always exposes wifi slice
to calling package without confirming any wifi permissions.
For current solution, we will check calling package's permission state
and decide whether slice provider should expose wifi slice or not.
Because settings search is a part of settings app,
this permission checker won't be applied to settings intelligence.
Test: manual, robotest, cts
Also run manul
Bug: 178014725
Change-Id: I2770b5b43366a5aa65c7519efc4243d350a21b26
2022-04-19 08:07:35 +00:00
TreeHugger Robot
fbaa9f3faa
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev
2022-04-19 07:52:35 +00:00
Yi-Ling Chuang
61022c6419
Fix UiBlcoker regression
...
We determine if the visibility should be updated by mIsFirstLaunch, and
mIsFirstLaunch is set to false in onStop(). This breaks the updatability
if there's a change before onStop() gets called.
So we move the value assignment to the end of checkUiBlocker() because
at that time, all blocker work should be either finished or timeout.
Also remove mIsFirstLaunch since mUiBlockerFinished can cover the
determination with the new design.
Fixes: 229565193
Test: Toggle Use Location in the location page and see the Recent used
section react accordingly.
Change-Id: Id6005e5b8b29cb8a6309068d0a2177489a3fb2f4
2022-04-19 15:12:29 +08:00
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
Joshua Mccloskey
9896d485ef
Merge "SUW enrolls FP before Face" into tm-d1-dev am: 179b83ac7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17776660
Change-Id: I4d45e6eaa7cfea582e6d4d60cedd861335a2e1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 04:10:41 +00: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
Joshua Mccloskey
179b83ac7c
Merge "SUW enrolls FP before Face" into tm-d1-dev
2022-04-19 03:45:45 +00:00
TreeHugger Robot
d89c64f189
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52 am: eb60f31139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: I872cc818554a9b43e0b1dc5eb5da6a4877567fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:42 +00:00
Hugh Chen
1de1873320
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88 am: f3cdbb79eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707
Change-Id: Id2da67f15bf9de911cb0cb30af410f931bf280ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:25 +00:00
TreeHugger Robot
eb60f31139
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: I3c9f9f8ae4c33d13add17ed282ed93bfb7af534b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:16:40 +00:00
Hugh Chen
f3cdbb79eb
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707
Change-Id: Ic7f091fe2f612edf3f6b3f0bad8f46b35158f849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:16:33 +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
a7f4640b77
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours am: 738e92a0fb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784947
Change-Id: I590c89f619e6df17101bb18a34e303baa7d450b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 01:06:20 +00:00
Bill Yi
716d464f27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours am: 9d63f65466 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784947
Change-Id: I644e89fee2c3eee5d72394f29e328f2a178e4010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 01:06:19 +00:00
TreeHugger Robot
71673e37ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours am: d5f23afcc8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784946
Change-Id: I0c01c1073f670b8380541aa894559b17f48b43ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 01:05:57 +00:00
Bill Yi
ea76b1d618
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours am: 6c8a55e3a7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784946
Change-Id: I2ae89045eea8902e0b14925ce35dec40888de8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 01:05:56 +00:00
Bill Yi
738e92a0fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784947
Change-Id: I43a1bfc8f493004e16420725d037178f592851f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:40:48 +00:00