Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,407 Commits 1 Branch 0 Tags
51aa95656f6457013a615af96a31ce2d4cff2183
Commit Graph

28728 Commits

Author SHA1 Message Date
Derek Jedral
f0bca9aab0 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 898e1d95f3 am: 57c7dd9741 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: Iea6b5bca8dc065c0e5014f99147b378409fc0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 23:07:44 +00:00
Derek Jedral
898e1d95f3 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I73bb1c3acb600908a9dca9eff4fa7b01486b78c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 21:46:18 +00:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Han Xu
07509fdb48 Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: 3894103292 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I214ed455a66ce6ae4319d84be959a57bdbef6f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 14:05:24 +00:00
Han Xu
3894103292 Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: Icfa29d0fa13e61acee1a0173d3d6e6603c04c97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 13:26:28 +00:00
Han Xu
2f970a1a05 Merge "Fix wifi QR layout to fix image stretching" into udc-dev 2023-05-08 12:17:59 +00:00
Treehugger Robot
06e92b4bf8 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:38:52 +00:00
Treehugger Robot
b5682235cc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:00:53 +00:00
Treehugger Robot
23d3eda967 Merge "Fix the battery string incorrect spelling" into udc-dev 2023-05-08 10:36:09 +00:00
Angela Wang
3716e194b1 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:11:21 +00:00
Angela Wang
b03509284e Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 08:33:26 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling 
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
 2023-05-08 16:10:27 +08:00
Han Xu
d2e6c2fe6d Fix wifi QR layout to fix image stretching 
Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
 2023-05-08 15:58:04 +08:00
Angela Wang
1113d5e9b5 Merge "Hides Flash Notifications illustration on tablet" into udc-dev 2023-05-08 07:46:55 +00:00
Jack He
a38db8628e Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I72f712e1996efe37547b14ca2e0c5dd806a49180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:56:57 +00:00
Jack He
22e2bd2b85 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:06 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev 
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
 2023-05-06 00:42:40 +00:00
Vania Januar
aa438742ed Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 11:23:05 +00:00
Vania Januar
247fed89c4 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 10:45:36 +00:00
Angela Wang
360cb671f2 Hides Flash Notifications illustration on tablet 
Since tablet illustrations are not yet finalized, we'll hide the Flash
Notifications illustration on tablet for now.

Bug: 280748155
Test: checks the UI on phone and tablet manually
Change-Id: I5a309dec3291f3585cc1d9769e2465c94250fa7f
 2023-05-05 09:54:04 +00:00
Vania Januar
072d8b90d0 Merge "Replace placeholder icons with stylus icons" into udc-dev 2023-05-05 09:50:11 +00:00
Oli Thompson
3c003a0300 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: If9125a6c97bfb3520e2ee31f68e178c604f29f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 19:14:11 +00:00
Oli Thompson
a99e532ce8 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:57:31 +00:00
Oli Thompson
69fcc2ba5c Merge "Change icon in settings work challenge" into udc-dev 2023-05-04 18:28:23 +00:00
Lucas Silva
69b0fd5d45 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 86231b9ec5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: If7e797520ae040dc9439b6c304da6afb9c09ca84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 16:09:46 +00:00
Lucas Silva
86231b9ec5 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I6bef5d5f5c4730c8832436b03242315aa4098f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:48:46 +00:00
Lucas Silva
d66bde103a Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev 2023-05-04 15:37:25 +00:00
Vania Januar
fb7c1766a8 Replace placeholder icons with stylus icons 
Bug: 250909304
Test: manual
Change-Id: I738a262ea0e3f03408c892adb758b99dd6d47386
 2023-05-04 11:24:39 +00:00
Daniel Huang
d9e55a3781 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 8de64b59bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I4d5b52025a89b84a7970d1aa5e53a19f0afa1eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:50:10 +00:00
Daniel Huang
da19d4a244 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I6bcdd801f50041a36f20443a0b2365e433ca7382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:28:46 +00:00
Daniel Huang
8de64b59bf Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: If96482ee38a1e3956ec1d936e555846ff66f2aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:38 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues 
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
 2023-05-04 08:56:41 +00:00
Lucas Silva
ccabc4e880 Update DreamAdapter to set icon tint colors in xml 
Setting in xml makes it easier to customize the colors in the SUW vs
normal views.

Bug: 279914654
Test: opened dream settings and verified colors
Change-Id: I367677426b8b538cca19dfdc5d343f66b8f89dba
 2023-05-03 18:22:58 -04:00
Treehugger Robot
1c79500a0d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 21:31:19 +00:00
TreeHugger Robot
6759c1f3bc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-03 21:29:38 +00:00
TreeHugger Robot
5b29767921 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-03 21:29:38 +00:00
Treehugger Robot
f4ca8c6033 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 21:27:41 +00:00
Treehugger Robot
80bbca1866 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Iae2aec7301d3c73b86b84638b0c0993a79168b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:20:21 +00:00
Treehugger Robot
0624c88484 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: If3d83edcabc4249b963666b8d1d83a2eab0e45e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:37:39 +00:00
Derek Jedral
5a75cd54d4 Change preference title if Active Unlock enabled 
Change the title of the preference to reflect that Active Unlock can
also be used to unlock the device.

Test: make RunSettingsRoboTests
Bug: b/271782800
Change-Id: Ie227e6dddfc024235fc3568899ef151f14f17696
 2023-05-03 12:37:01 -07:00
Treehugger Robot
c3d6820ffd Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae Merge "Update auto_rotate_summary string for different product" into udc-dev 2023-05-03 19:09:07 +00:00
Patty Huang
f05615f1e8 Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details 
Bug: 280020008
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: I559f34f2b0764c4f566fe1e0c1357929e2c88fb6
 2023-05-04 01:26:15 +08:00
Oli Thompson
6d16151639 Change icon in settings work challenge 
Screenshots in bug

Test: manually tested
Bug: 279559156
Change-Id: If3c9415db476f0ca0d26e74311e7bcd8d7e33dbb
 2023-05-03 12:39:27 +00:00
Edgar Wang
e416e27543 Update auto_rotate_summary string for different product 
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
 2023-05-03 17:44:42 +08:00
Diya Bera
2f9df85d1a Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I347b01c9dd6ef0fe73b4cd2052060480697266b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:28:04 +00:00
Becca Hughes
b66c783024 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I5c3133f66d3c0245b408946fdcbeffa9f4f91018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:27:42 +00:00
Diya Bera
d4066f5f7a Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I9e5379823d02eed4848e033eb72bf163456a4f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:49:25 +00:00
Diya Bera
eb63f480cc Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I97f9fe6b4e4fc3abaeff42490b32008c760cb29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:48:27 +00:00