Zoey Chen
db02f10b07
[Settings] update the db list when back to UI
...
Bug: 271524675
Test: local test
Change-Id: I26c7d64e6f040c62c9efb1438efe328f5744fa02
2023-03-20 09:08:34 +00:00
Zoey Chen
b9f6bb7958
[Settings] Fix the inconsistent data/entity when switch the app/fragment
...
Bug: 271524675
Bug: 273825889
Test: local test
Change-Id: I7ec6d824c5154422aaad056dc3f4dcd365fef5e1
2023-03-20 09:04:24 +00:00
SongFerng Wang
d911a095eb
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev
2023-03-20 08:59:12 +00:00
Betty Chang
ee536e004c
[automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
am: 0fd1625895
-s ours am: 9a40a296cc
-s ours
...
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: Ibcec14b1fdaa8f859958a499932ec6dcee4f7ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 08:53:00 +00:00
Betty Chang
9a40a296cc
[automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
am: 0fd1625895
-s ours
...
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I0886a26aba0650bc1699878e30ffb17ebbd3a3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 08:13:47 +00:00
Betty Chang
0fd1625895
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:35:52 +00:00
Zoey Chen
4a3d0d7f8e
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522
Change-Id: I52941b212917464a6489dcd2bf782bcb0f6e3519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:19:45 +00:00
Betty Chang
1de44c2447
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 06:59:18 +00:00
changbetty
7cf90fbe36
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-20 06:48:36 +00:00
SongFerngWang
c678caba4a
Modify the log at AutoSelectPreferenceController
...
Bug: 270652395
Test: build pass
Change-Id: I3b9611fd3704d0965ace12f2bb13c28ace60eadf
2023-03-20 14:48:16 +08:00
Zoey Chen
ce77de4240
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev
2023-03-20 06:43:23 +00:00
SongFerngWang
88717f2c3f
Avoid ANR when UI query network selection state
...
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.
Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
Betty Chang
18eb985e41
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2023-03-20 06:33:42 +00:00
changbetty
85dd572f18
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
Merged-In: I416f0a39e31276876e63360664555f99dd7297c9
2023-03-20 05:48:34 +00:00
Bill Yi
6bafbe2c33
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours am: 239e6fb371
-s ours am: fced4027ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: Ic8ff3ce865787d4a55a77ece4ecd5effb09fe516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 22:08:01 +00:00
Bill Yi
7d57d8a077
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b
-s ours am: 11970fc875
-s ours am: da6f0e89d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: Ic88ddc010bf34395247503c12f5dcd9082b6b15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 22:07:50 +00:00
Bill Yi
2099dc730e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b
-s ours am: fe39800ae9
-s ours am: c0fb545e05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I32d8fc81680aec5ef7bc2846ecc3aa88f7b99052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 22:07:33 +00:00
Bill Yi
9f2fdb71c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452
-s ours am: d4b4e93227
-s ours am: 28d89441e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I7e7c11a648bb53a93ae94a8196f9d12b82a4e200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 22:07:18 +00:00
Bill Yi
fced4027ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours am: 239e6fb371
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: If1cf18e2670f32b46345e9a5cd58a341ade785f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 21:27:28 +00:00
Bill Yi
da6f0e89d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b
-s ours am: 11970fc875
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: I82c25832e0bc866dd3358bfdc6b3221715f40a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 21:27:26 +00:00
Bill Yi
c0fb545e05
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b
-s ours am: fe39800ae9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I4a286a22928278eb03a1b598b6c5a7124ebad845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 21:27:18 +00:00
Bill Yi
28d89441e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452
-s ours am: d4b4e93227
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I8e1f41dc91d7b15c4c9ae7c5f80f8dbef35ad589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 21:26:41 +00:00
Bill Yi
239e6fb371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: I1ca121ca22fea96d7e31a26814f1d37a3718f44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:46 +00:00
Bill Yi
11970fc875
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791
Change-Id: If014a60d0905d772a9b86e6ead2abb604c1bb726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:35 +00:00
Bill Yi
fe39800ae9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: If3b0bc9aa7a005b7a408628254ab71028bec9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:48:22 +00:00
Bill Yi
d4b4e93227
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132060
Change-Id: I3937a3f3b9fe3b0f28f18118bf38fec03ed22256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-19 20:47:59 +00:00
Bill Yi
77b98813c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-19 20:02:05 +00:00
Etan Cohen
d3f7fa6aef
Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS
...
The ACTION_WIFI_ADD_NETWORKS allows an app to request the user to
confirm addition of WiFi networks. The intent attaches
WifiNetworkSuggestions (used to specify the networks). However, the
calling app may configure MAC randomization to be disabled - using
reflection.
Fix to always override the MAC randomization setting to enabled. This
will override any user configuration to disable randomization - however,
considering this is (now) a new configuration it should safely start
from the default Setting.
Verified using using a test app to force non-randomized (using
reflection) value and confirm that without change randomization is
disabled and that with change it is reset correctly.
Bug: 236825742
Test: manual - use a test app
Change-Id: I3fba958c461d88005fdb5d2c3d1f2fd4ce725b8c
2023-03-19 16:20:48 +00:00
Jason Chang
a261a9f5f1
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828
Change-Id: I08bb7f3662c82e52ed36f73b3cff6288fd093295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 14:45:31 +00:00
Jason Chang
9522a44bb6
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev
2023-03-18 14:10:58 +00:00
Grace Cheng
ff0fa142f4
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
am: 59992bbbb8
am: 387c36968b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565
Change-Id: Ifebc427b74a8008320d8691689042e2e7bb31084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 07:59:48 +00:00
Grace Cheng
387c36968b
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
am: 59992bbbb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565
Change-Id: I12a196c7c0b630885af8ebb820be6ef45177ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 07:22:02 +00:00
Grace Cheng
59992bbbb8
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565
Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b
Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev
2023-03-18 06:18:32 +00:00
Jason Chang
848973d300
Fix the Fingerprint enrollment page's title text creates a truncate
...
problem when it needs three lines on the R4 device
Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.
Bug: 269437675
Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.
2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.
3. Check the UI if it has been fixed.
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
TreeHugger Robot
36ed451b84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours am: 0230bb216a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I3f0299a878407139aa3f237c143d6e0bf56df5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:34:02 +00:00
TreeHugger Robot
82e7956228
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ibf67e708f7af6b6f030724752e919e3055e9485c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:53 +00:00
Bill Yi
e4cbdfe5d4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
am: 816a0bbd13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Iad55015b6971cbe394dd7d8651a4cef74d57dacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:51 +00:00
TreeHugger Robot
74d84f1576
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I167aa48440729ea63cb81cfc864447621ead0434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:30:08 +00:00
Bill Yi
6725be4303
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
am: 14e9cdb4fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I62ad965d80766bb9562109fc6133547425aafcb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:29:37 +00:00
TreeHugger Robot
0230bb216a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ie06f53690b26101fe0963a8aee57d94907d9e1eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:24:57 +00:00
TreeHugger Robot
3dc2599568
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-17 23:03:30 +00:00
TreeHugger Robot
7d2143f9ed
Merge changes from topic "tc_change_23031706_16" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 23:03:28 +00:00
TreeHugger Robot
96d5e1edf6
Merge changes from topic "tc_change_23031706_17" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 22:56:07 +00:00
Zoey Chen
76bb350c73
[Settings] Do not set text if the fragment is not attached
...
Bug: 273415166
Test: loacl test
Change-Id: I5298727359191d8ce9c4526279faa4e8a3c1df43
2023-03-17 18:14:49 +00:00
SongFerng Wang
866a6b6428
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: Id2b9d2c0f5467a653c1ace5c219369806d11db12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:09:18 +00:00
SongFerng Wang
dbfc04cb2d
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev
2023-03-17 17:43:07 +00:00
Becca Hughes
fb4488ea83
Add subtitle to settings (settings)
...
Allows a credential provider to show a
subtitle/summary underneath the title in
the list of providers.
Test: ondevice & atest
Bug: 253157366
Change-Id: I481da16985027a49ee464623b6db166d941cab55
(cherry picked from commit on googleplex-android-review.googlesource.com host: 6474e01372
)
Merged-In: I481da16985027a49ee464623b6db166d941cab55
2023-03-17 17:29:23 +00:00
Darrell Shi
6352eaf0c0
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
am: 2119a2dcf9
am: 5f15e00e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Id67b1e19ff8bbfa3bc069ad2f7fb046827e3cce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:27:47 +00:00