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
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
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
Bill Yi
9d63f65466
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3
-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: I2979722889c7a3664c3730fc1f2343957c2df4d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:40:43 +00:00
TreeHugger Robot
d5f23afcc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26
-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: I03063bc040ff8432f92639d7abd9d9c5436831e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:39:11 +00:00
Bill Yi
6c8a55e3a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284
-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: I1cf43b27d3698aad7231934b41a5e631e72e5a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:39:10 +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
445dd2bd45
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-19 00:25:12 +00:00
Bill Yi
b9dd1a3a2d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-19 00:22:17 +00:00
Bill Yi
168e7677f7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-19 00:20:30 +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
TreeHugger Robot
455bf0c881
Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev
2022-04-18 21:50:38 +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
7562644667
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb
-s ours am: 467b85d088
-s ours am: 5734853d61
-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: I34f38474a562ff2a619da70bf00ecf387043eefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 19:49:47 +00:00
Joshua McCloskey
1dd4f54d58
SUW enrolls FP before Face
...
Test: During SUW verified Fingerprint enrollment
comes before face.
Test: During SUW enrolled multiple fingerprints than 1 face.
Test: Skipped and cancelled on every possible screen to ensure behavior
was correct.
Bug: 228607474
Change-Id: I4c50763a804fe4eb9d62451eb2f957545857723e
2022-04-18 19:42:35 +00:00
TreeHugger Robot
5734853d61
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb
-s ours am: 467b85d088
-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: I61575bf7aeb0e1bf99e275a3ece78d3f3db325d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 19:26:13 +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
2972c8c462
Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d
am: 5bf683e8f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: Ib848e8a84d113f56002f3a9d810da8eb0f32f99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:45:29 +00:00
Bill Yi
fc6437b4fb
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
am: fb20f3183b
-s ours am: 2631a9a4f1
-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: I144dbdf1dda930056d54e64a69b3383166bd9a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:45:28 +00:00
TreeHugger Robot
4c32ec0371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801769
Change-Id: I77e12637a86224404abbc0b7b51e4f616e77b234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:45:21 +00:00
Bill Yi
8fda064295
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801769
Change-Id: I5064b78c2ac8b2bfa8b05524d47324cf67673b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:45:20 +00:00
TreeHugger Robot
74a36a7659
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801574
Change-Id: I5a28499c697435d9b2d85ad7c94032bff4e90697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:45:08 +00:00
Bill Yi
a719bfa0b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801574
Change-Id: I892b308850183401f240d915e6dd41f509bff424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:57 +00:00
Bill Yi
c71203f16d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65
-s ours am: 6c46c20518
-s ours am: fa0b661076
-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: Ie1afc461ae8f3561b19c88807d093bb7911ff557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:51 +00:00
Peiyong Lin
fa6ecc7857
Merge "Clean up extra app info." into tm-dev am: bd26c3c747
am: fceaaa80a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962
Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:47 +00:00
TreeHugger Robot
5bf683e8f5
Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I19124fd659f0faa1e212e1dd35aa2133552880f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:24 +00:00
Bill Yi
2631a9a4f1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
am: fb20f3183b
-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: I07f502dac11a5c652c4a248dd90c127949678afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:23 +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