PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,050 Commits 1 Branch 0 Tags
08eea0993ec2f7056e352cc83e899dab867e1924
Commit Graph

121050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
08eea0993e Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

Change-Id: I81549c19fffa32e95b506bf5d6df8166800db21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 11:04:39 +00:00
Zoey Chen
7a492b4098 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev 2023-03-20 10:45:34 +00:00
SongFerng Wang
1ef40e5503 Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899

Change-Id: Ic8f886b6e0d8aece70f36f423b2c56fd12e4d2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:44:38 +00:00
SongFerng Wang
e3bcf8a199 [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours am: 866c7e17f8 -s ours 
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: Ic40515e5c4acae8c29660152255e9cf633de3938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:44:29 +00:00
SongFerng Wang
d687c01745 Merge "Modify the log at AutoSelectPreferenceController" into udc-dev 2023-03-20 10:43:33 +00:00
SongFerng Wang
866c7e17f8 [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours 
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: If26f2822421623142391f3328d5ebd26097ae82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:05:32 +00:00
SongFerng Wang
782bb2f069 Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 09:29:21 +00:00
Zoey Chen
cb4e0bd018 [Settings] Should not show WFC UI in the SIM page if the SIM does not 
support WFC

Bug: 270792637
Test: manual
Change-Id: Ic67bd2e766d66c91fc4b0fcf5a5355debd805ac6
 2023-03-20 09:15:55 +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
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
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