PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,816 Commits 1 Branch 0 Tags
f2a325a25e14ab4eb1abcf65f686cd0684fec012
Commit Graph

29483 Commits

Author SHA1 Message Date
Treehugger Robot
73ec1f8416 Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev am: 8f3679ab91 am: fe675b620c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601572

Change-Id: I9fcd6a377d5fd0174261bf3dcc2e99d575509e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 08:12:26 +00:00
Treehugger Robot
fe675b620c Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev am: 8f3679ab91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601572

Change-Id: I404c62a74fe886eb4f2d8e7c458e91237f0ce3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 07:25:53 +00:00
Treehugger Robot
8f3679ab91 Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev 2023-06-08 06:16:32 +00:00
Treehugger Robot
c6e0a970ba Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 am: 24e8361e2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Idd53e9fa39a7202009b974016f8d045db06ef455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 02:15:21 +00:00
Treehugger Robot
9c4b3ad72b Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ie7e71eb056a9976296dd2d6da95cc03f1e01ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 01:37:16 +00:00
Treehugger Robot
b164cf7111 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c334825405 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I382981ba325b24696e797755eb6be07b46b01ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 01:34:02 +00:00
Treehugger Robot
24e8361e2a Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 am: c0338e5dc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: Ibbbcddcfadfbadcc66cbf2673f34ab8a1d29e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 01:33:40 +00:00
Treehugger Robot
c334825405 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I4d882fe72b24e512d089772378cdc31d69e277e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 00:50:26 +00:00
Treehugger Robot
c0338e5dc3 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 00:50:15 +00:00
Treehugger Robot
a34a510a40 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev 2023-06-08 00:15:18 +00:00
Oli Thompson
ab73c1a3e3 Fix low contrast on work challenge screen emergency call button 
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
 2023-06-07 19:25:59 +00:00
Zoey Chen
3b698670ad [Regional] Change the wording from "Use app default" to "Usw default" 
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
 2023-06-07 12:40:05 +00:00
George Chang
f3160735e4 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: cb5b26ff73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ie331e2ac5c1d3701ae16d123610752e6f6554082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:53:00 +00:00
George Chang
6b83876c1e Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:15:29 +00:00
George Chang
9a3cb029b5 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 4b49493d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ic377f1dd84eac4f051f3695c883ff9986bb02d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:11:22 +00:00
George Chang
cb5b26ff73 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ibb5362d87f383062376173d2820f8fbb80506deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 10:11:22 +00:00
George Chang
4b49493d05 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I65f5b640f3f66f69f83cab8f81f6229064f6d363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 09:33:13 +00:00
George Chang
29dd0bf796 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 09:33:13 +00:00
George Chang
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
Wenhui Yang
71b8076566 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 am: e947da08e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I097e0a9e37fb960118efc10724ebe95efdf7caa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:53:16 +00:00
Wenhui Yang
e947da08e3 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I1aa4a7a33a14adae4a5fcbe1f443b3af89ed674b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:54 +00:00
Wenhui Yang
4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev 2023-06-06 21:09:56 +00:00
Wenhui Yang
5e71aee4cd Fix face model delete message 
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
 2023-06-06 19:44:17 +00:00
TreeHugger Robot
ce5a816f29 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
TreeHugger Robot
6c069119ea Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-06 15:05:24 +00:00
Treehugger Robot
fb4945a4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
8db6cc323c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string 
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
 2023-06-06 21:39:01 +08:00
Bill Yi
1f4423fafc Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-06 13:27:22 +00:00
Bill Yi
e390627eb5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-06 13:27:22 +00:00
Treehugger Robot
e5e57499b8 Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a am: b0df718bae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: If6e3d192523e9ae43ff157234e8a9c4193adb0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 07:58:28 +00:00
Treehugger Robot
2237bd2d6e Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Iac12a1a635d0aab70b994f49a18b4914aa0d412e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 07:20:29 +00:00
Treehugger Robot
0c13ef9e5e Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: e6d4fa7daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: I7841aa63a4c06f4d7cf7f6500e2989e95a2c11f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 07:17:45 +00:00
Treehugger Robot
b0df718bae Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: I3af28ff3dcbb096e8376d0983cbfd54ce73f72b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 07:16:22 +00:00
Treehugger Robot
e6d4fa7daa Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: I94b718ca2dfebe1a704e558efb9e4dcf1c9cb200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 06:38:26 +00:00
Treehugger Robot
d05997872a Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Ice47c201387d778d3bee0aa239fdd3b3eb59a031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 06:38:00 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +00:00
TreeHugger Robot
a28a3df494 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-05 19:38:55 +00:00
Treehugger Robot
13c488fc3c Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: I938c2414fec70253fa4c38f8e5959d04e121e2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:44 +00:00
Treehugger Robot
065885622b Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:03:19 +00:00
Treehugger Robot
dbec7ba7fb Merge "Use custom action key icon" into udc-qpr-dev 2023-06-05 16:56:35 +00:00
Bill Yi
e1108d7d99 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6d9fb22b34aa948324f12dbd8421a53d3d180f11
 2023-06-04 18:42:33 -07:00
Bill Yi
d152c7b1bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4fe08ee7dc7f803451ff0389a2587a5c99d1023e
 2023-06-04 18:40:52 -07:00
Bill Yi
f346881098 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32cdd728af994f151117d2a96c1f5e27508eba9e
 2023-06-04 18:38:42 -07:00
Bill Yi
7d99401b8e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I855db4675b33516b1bd38cb58406a9daa8ca188e
 2023-06-04 18:37:48 -07:00
Bill Yi
c96c00059d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I37bbb2e912db7d52298bf0143d6e087a26b421f2
 2023-06-04 11:25:20 -07:00
Bill Yi
36c8f431b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4c4e07bd5638a831678634083762723b2e09561
 2023-06-04 11:23:07 -07:00
Bill Yi
bd46bde1e6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a4b1fcadd0684e5bcb46fcae5f58ba0e4bdd351
 2023-06-04 11:21:16 -07:00