PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,217 Commits 1 Branch 0 Tags
ad5b6855db9752327f182a3dddeef32e84cb9bcc
Commit Graph

117217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Cheng
59f4b7bdc9 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253

Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:38:19 +00:00
Grace Cheng
94f6a76ea1 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253

Change-Id: I9d17ad0d79285590ae460146f056b59a0d46066b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:37:41 +00:00
Grace Cheng
a738eba09f Adds null-check on finger animation in enrollment 
Adds a null-check before setting the finger animation during SFPS
enrollment

Test: Change display size to highest setting (sets mShouldShowLottie to
false), and verify that user can enroll finger successfully
Fixes: 247044864

Change-Id: I3d7f0bd3078e3a4516f656a8ee897387b0ca15c6
 2022-09-22 17:54:27 +00:00
Gil Cukierman
02ef8722be Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:50:11 +00:00
Grace Cheng
108b73d972 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev 2022-09-22 17:37:13 +00:00
Grace Cheng
8669dc3697 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev 2022-09-22 17:26:22 +00:00
Gil Cukierman
ccfd44162f Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:12:54 +00:00
Bill Yi
efb92b159f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617 -s ours am: 4ee0f9853a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea0d77cb207776d0230bd43c090c797a572e263c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:49:45 +00:00
Bill Yi
168eee8d2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c -s ours am: 1315b49ed8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If20b43644523aef2976d998052ea483407916b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:49:34 +00:00
Bill Yi
6c9cede2aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326 -s ours am: 23f515945d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07293c561c9682962b936c3ed640bbe4f0a9aecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:49:15 +00:00
Bill Yi
2764b149e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea -s ours am: 119210d456 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I624989fd9b587020c4243646cae82b68deeb195d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:48:59 +00:00
Bill Yi
4ee0f9853a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib71a13fda76003373003419c38365936facf1de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:31:35 +00:00
Bill Yi
1315b49ed8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bf66796217c585bbc76674f0f865f7cc169d16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:31:16 +00:00
Bill Yi
23f515945d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I896b5355f873b97256d021112dd74de1fd550899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:30:58 +00:00
Bill Yi
119210d456 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I184dedbce3f2588a9e15359ab6155403f42c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:30:43 +00:00
Gil Cukierman
1f750fcba6 Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 14:30:53 +00:00
Bill Yi
65c5abe617 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Bill Yi
4c5b5a7326 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Gil Cukierman
594002e21a Merge "Use AAPT2 For SettingsUnitTests" 2022-09-22 13:40:19 +00:00
TreeHugger Robot
0f86f86a70 Merge "Fix checkcolor_hook error" 2022-09-22 12:44:26 +00:00
Ayush Sharma
a00393015a Merge "For top layout use FrameLayout than GlifLayout" 2022-09-22 12:41:37 +00:00
tom hsu
3d138b372b [Settings] Update UI when bluetooth connection is down. 
- When Airplane mode on, all connection shall be disconnected. In
   current design, when bluebooth disconnected, network page in Settings
   does not udpate the UI.

Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
 2022-09-22 19:34:35 +08:00
Sunny Shao
f35d7f5f0e Fix checkcolor_hook error 
Bug: 247692342
Test: repo upload OK
Change-Id: I8fc4db6f880b073e44a78d63fcd99cc86c2255d8
 2022-09-22 19:26:59 +08:00
PETER LIANG
93a613f2f6 Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea am: dace33e3c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091

Change-Id: I2de86b0a6b8eac29e04fb8ce6c77750d88321322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 09:20:28 +00:00
Jason Hsu
fef9587cfe [automerger skipped] Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145 am: b161bade37 -s ours 
am skip reason: Merged-In Ic0be940c8466b5e1e301255868c29d06bd4428bd with SHA-1 cfec092373 is already in history

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

Change-Id: I167132c5bd4fc2d6ec7af7575f05e18a704a57c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 09:19:39 +00:00
PETER LIANG
dace33e3c3 Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091

Change-Id: I735fa2d96c60a92c270208620909353c25619960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 08:51:25 +00:00
PETER LIANG
71c3e06bea Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev 2022-09-22 08:29:50 +00:00
Jason Hsu
b161bade37 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465

Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 08:27:44 +00:00
Jason Hsu
9ac1712145 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev 2022-09-22 07:37:28 +00:00
Zekan Qian
daceb0cabb Merge "Explicitly set parameter name when call SettingsPage.create function" 2022-09-22 07:18:03 +00:00
Bonian Chen
e32f252b8a Merge "[Settings] Remove unreferenced method" 2022-09-22 06:23:36 +00:00
Chaohui Wang
faf11f96e7 Merge "Clean up AppButtonsPreferenceController" 2022-09-22 04:59:12 +00:00
Bill Lin
4c9e259ccd Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf am: 8a8fe4fabd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471

Change-Id: Id20b934f044607e7b4f93b2d5cb5ce37322fd65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 03:42:27 +00:00
Zekan Qian
90e5e91f28 Explicitly set parameter name when call SettingsPage.create function 
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I068857ac3a5e12cfcf0148789b546476663414e1
 2022-09-22 11:08:02 +08:00
Bill Lin
8a8fe4fabd Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471

Change-Id: I4b46bef348873f663b4c7368a2e659359e6f8486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 02:46:29 +00:00
Chaohui Wang
d21f5916d2 Clean up AppButtonsPreferenceController 
mDisableAfterUninstall and mUpdatedSysApp is always false.
And appChanged is always true.

Bug: 236346018
Test: Manual with Settings App
Change-Id: Icfb9fbea92d5c728cbef9d76569d59d5085a51e6
 2022-09-22 10:02:44 +08:00
Bill Lin
a46b426bcf Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev 2022-09-22 01:55:59 +00:00
Peter Liang
6a847bba04 Fix that display size and text preview is going blank while scrolling the page in landscape view. 
Problem:
It seems that the inconsistent index would cause the view stub couldn't be inflated successfully.

Solution:
Adjust it to the same index.

Fix: 244336110
Test: manual test
Change-Id: I2688e6feb61ac64f989e5f8e4910e6eeca3a97bf
 2022-09-22 01:20:45 +00:00
TreeHugger Robot
d8bba54a42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours am: 870f086d09 -s ours am: e0bbfab81c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad6c487d2effc358777b929483c4cc13b19b1fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:39:35 +00:00
Bill Yi
aa36fa7da7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: f6a5f7a782 -s ours am: 6f94dadf41 -s ours am: 2c38b1f17f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I476885775321fdee9977482c47e91d7d6fb64501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:39:23 +00:00
Bill Yi
a6bae0a175 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9cc6bc637f -s ours am: b894f205e4 -s ours am: 24d5554efb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8161ddcb0dc5da6114d4092435205f27b67216b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:39:06 +00:00
TreeHugger Robot
bc428e6287 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d -s ours am: a823e92625 -s ours am: 84984cfb16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib19bbe78b63c32e0a691b9e128fe9ea378ff8c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:31:57 +00:00
Bill Yi
0817f7d985 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00 -s ours am: bf1d22276a -s ours am: 10de28b502 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6cd3138156970b290dbe85aaccbfe1698a9483d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:31:55 +00:00
TreeHugger Robot
cc281f6175 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8 -s ours am: e3b73b4216 -s ours am: 2cb99dadc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3339871d8f8d3886ae4c295545198b6b3b93f788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:31:49 +00:00
Bill Yi
202c522bae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add -s ours am: 329b7e6713 -s ours am: de925e65b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13301671629bcbd4ff671726876f3ee6b735291e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:31:39 +00:00
Daniel Sandler
4592c110e0 Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d am: ba81fe61cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711

Change-Id: I76b538e6df566b1cbd9f6f36e9813e71768bb0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 00:30:19 +00:00
Bill Yi
c1b4909f3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I404fe77587be7e7a199e0b638a99f8528bc55e9e
 2022-09-21 17:17:45 -07:00
Bill Yi
82148a40ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42f13be21657749f18b7e808ca1f6a008a38cf26
 2022-09-21 17:14:58 -07:00
TreeHugger Robot
e0bbfab81c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: ac3b26c186 -s ours am: 870f086d09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfa4618a147b8be9082d6a4452d18abc98d80e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-21 23:51:29 +00:00