PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,996 Commits 1 Branch 0 Tags
953a6fec66873361a743d02cdab776ad6eec09d2
Commit Graph

120996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
953a6fec66 [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: I4f7d296365fa7dca6d5fd4bb434ff1549f7644de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:44:31 +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
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
2a874ed261 [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: I8ad731bdbbad463e7667e1c79816baa25839fc70
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
eadb730164 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: Ic5b81e03b184c7ea94ceae385b4eef175bbdb189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 07:19:24 +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
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
2b767e23c9 [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: I3e0fdab8f1c8592fa5e40f8e16b1f7b725ec481d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:06 +00:00
Bill Yi
0a1cecff05 [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: Ibee2b2fb73ee481357b695dff235a7fb03da530e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:07:00 +00:00
Bill Yi
3bd0a334f1 [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: I1c3ae7704d9b34f2a88daa233ed101c5246b44df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:06:54 +00:00
Bill Yi
7f7f17724b [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: I9257cbe02c349dbd05d32695f3d74bb72670ee72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 22:06:15 +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
9b94df1d40 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: Ia34c19988e286741df8aee146e15e9df1e2c2ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:44:39 +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
0adbb4fe60 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: I0dfea68284b0e19aaa8a7c21eb8733bc02251a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:59:51 +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
Bill Yi
cb5f2a5316 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
Bill Yi
3bcb58f7cd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
Bill Yi
7879f2d529 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
TreeHugger Robot
71e0457e8d [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: Ib00769119b011b725eeefbe09b412df7272aaeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:46:55 +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
e384716d01 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: I409ed99c7cb3f4e15355fe46d57e647013ac600b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:15:53 +00:00
Bill Yi
cb8d478c8a [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: I07847adec48311d31838af98789508fc35c05c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:15:48 +00:00
TreeHugger Robot
75118dc01e 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: I151448763d9e0707b51aeb77ece6a6e072089cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:13:03 +00:00
Bill Yi
471a7e486f [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: I4a1e65bca77d0f8e165ddf185b29a527727ebcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:13:00 +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
20d9a4e371 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: I461d82905fd12a886cb1bba9d3517a223edb0b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 17:48:30 +00:00
SongFerng Wang
dbfc04cb2d Merge "Update OpenNetworkSelect UI at main thread" into udc-dev 2023-03-17 17:43:07 +00:00
Darrell Shi
ce5c4d3cea 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: I3daf4bcf4becdf86996fbcf0efccb58df0168997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 17:40:57 +00:00