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

120776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
5f0516e69b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +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
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
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
SongFerng Wang
dbfc04cb2d Merge "Update OpenNetworkSelect UI at main thread" into udc-dev 2023-03-17 17:43:07 +00:00
Darrell Shi
5f15e00e07 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324

Change-Id: I38545423c8784f826265ece8aef6a75662cb7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 16:50:59 +00:00
Darrell Shi
2119a2dcf9 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324

Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008 Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev 2023-03-17 15:47:23 +00:00
Bill Yi
14e9cdb4fd [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0 
Blank merge reason: commit message contains skip directive

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

Change-Id: I74c650a1dc74ebe956bf01f55c33a99593a34057
 2023-03-17 13:17:19 +00:00
Bill Yi
816a0bbd13 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I11219ef573331fc96a958889a2b0d36699a7b869
 2023-03-17 13:17:11 +00:00
Betty Chang
bb2c12b990 Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev 2023-03-17 11:19:50 +00:00
SongFerngWang
12066c72f9 Update OpenNetworkSelect UI at main thread 
Bug: 270652395
Test: local test and atest AutoSelectPreferenceControllerTest
Change-Id: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
 2023-03-17 18:49:38 +08:00
Jason Hsu
fe9c359367 Merge "Update the exclamation icon can be announced by screen reader" into udc-dev 2023-03-17 07:29:02 +00:00
SongFerng Wang
e959be60a9 Merge "Close the dialog activity when user click cancel or background" into udc-dev 2023-03-17 07:13:36 +00:00
changbetty
74dc069d16 [LE Audio] Set activity for result after scanning the QR code 
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
 2023-03-17 06:02:08 +00:00
SongFerngWang
07114a6d00 Close the dialog activity when user click cancel or background 
Bug: 241346100
Test: local test
Change-Id: Id9d931fc8b74ef566ffe3c6135aaf433cd9f770b
 2023-03-17 12:37:29 +08:00
Bill Yi
82c23db452 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
 2023-03-16 20:40:36 -07:00
Bill Yi
59769526e0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15422a02d7174c3cfc21c00ce39cbde8d0234c8b
 2023-03-16 20:29:17 -07:00
Bill Yi
7c58d10ebb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9910d114216f4f3c749fa096cb37e0d843bb82fc
 2023-03-16 20:23:48 -07:00
Menghan Li
813f654aa1 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: Id167b7cda9295904f5f8aa173bacaeb7175a9b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:37:43 +00:00
menghanli
dba1c83ed4 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I3059f4c5bb13108c00abfe3844e45739312ba155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:37:36 +00:00
Menghan Li
2600b1bbc2 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

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

Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:58:48 +00:00
Michael Groover
8458e7f630 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev 2023-03-16 20:41:12 +00:00
Menghan Li
1306ebf737 Merge "Update color-check-baseline.xml" into tm-qpr-dev 2023-03-16 20:29:25 +00:00
Kweku Adams
9a087d6c19 Merge "Revert "Remove duplicate strings."" into udc-dev 2023-03-16 20:14:16 +00:00
Julia Reynolds
fe310a86de Merge "Remove explicit number from string" into udc-dev 2023-03-16 18:52:25 +00:00
Michael Groover
38819fd906 Make CheckReturnValue errorprone check a warning for unit tests 
CredentialManagerPreferenceControllerTest now differs between the
current development branch and internal main, and the
CheckReturnValue errorprone is failing in the branches that use
the code from the development branch. Modifying
CredentialManagerPreferenceControllerTest does not resolve this
because it results in merge conflicts, but making this check a
warning in the development branch will allow the fix to reach all
affected branches.

Fixes: 273833063
Test: m RUN_ERROR_PRONE=true SettingsUnitTests
Change-Id: Ia923f0d988b1428cbb7378f33b4703ed19113dcd
 2023-03-16 11:31:05 -05:00
Julia Reynolds
8126e93ff2 Remove explicit number from string 
So it can be translated properly
Test: View notification history screen
Fixes: 222128037

Change-Id: I2d11dd4e427c19ef0c003b1fa2b6882267e2026e
 2023-03-16 12:27:37 -04:00
Matías Hernández
08893ed0b3 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev 2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034 Refresh the app's "Conversations" list when there are none 
Also hide the header in that case (simiarly to bubbles).

Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
 2023-03-16 15:07:13 +01:00
Jason Hsu
5c1652eab0 Merge "Update strings for hearing device U features" into udc-dev 2023-03-16 09:16:51 +00:00
jasonwshsu
7be7ef9ecc Update the exclamation icon can be announced by screen reader 
* In hearing deivce and flash notifications U features.

Bug: 268144365
Test: open screen reader to read the footer preference
Change-Id: Ifb0809c1e445aea4aeea9db9b4ec09cd6d0d4095
 2023-03-16 16:08:46 +08:00
jasonwshsu
1b0a454344 Update strings for hearing device U features 
Bug: 270086620
Test: flash the rom and check UI
Change-Id: Iafc1691d2a51fc1c8111059ff5b2953889b40012
 2023-03-16 16:08:40 +08:00
Chaohui Wang
ba39aa506b Merge "Move LogEvent action to Settings" into udc-dev 2023-03-16 06:34:14 +00:00
Bill Yi
ad6b0526ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bc07fa0395e104736cb53de3e0271578e1ba382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:43:52 +00:00
Bill Yi
1b76d26f1b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-16 05:20:45 +00:00
Bill Yi
ef87f55d9a Merge changes from topic "tc_change_23031509_20" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-16 05:20:45 +00:00
menghanli
796fcccd9b Update color-check-baseline.xml 
(Fixed according to the instructions in prebuilts/checkcolor/README.md)

Bug: 273556105
Test: repo upload checks
Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2
Merged-In: Ife355166df080ce7371a95b5cea28575227153f0
 2023-03-16 02:29:38 +00:00
TreeHugger Robot
f4c558c9cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3156715be7dc47c0f6801066949f1becf6d50ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:24:54 +00:00