PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,662 Commits 1 Branch 0 Tags
d450e06355075a6589fde3724f2e55239e16be32
Commit Graph

26066 Commits

Author SHA1 Message Date
Bonian Chen
8097546f46 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:27:37 +00:00
Bonian Chen
244f21d9d7 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad resolve merge conflicts of 81d1cd0871 to stage-aosp-master 
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
 2022-07-29 07:34:35 +00:00
Tsung-Mao Fang
68fa74625c Set an action name for wallpaer index am: 0f7b80f47f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: Id464e7cb46590b003ecb2fab9d73b69fc14fda9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:02:38 +00:00
Tsung-Mao Fang
0f7b80f47f Set an action name for wallpaer index 
Since Android T+, app has to assign an action name for opening a
external app page.

Test: Manual test wallpaper search result and can open.
Fix: 239867167
Change-Id: I4579aaf6e831ff82721c958e6b91ede4cabda2c8
 2022-07-26 02:36:13 +00:00
LuK1337
988a76f5bb Settings: Make NetworkScanHelper max search time customizable 
Default max search time (300) fails on some devices.

Test: Network scan works on OnePlus 9 after overlaying
      max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
 2022-07-25 17:44:40 -07:00
TreeHugger Robot
1ea00326ca Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-23 02:03:07 +00:00
Bill Yi
1e9765bba2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib8c45dd3a435a2e409918b578428fdb7dd131243
 2022-07-21 23:17:43 -07:00
Bill Yi
04531538c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6afe4d66b49f6e961977912550f1f3f724f816f
 2022-07-21 23:02:36 -07:00
Bill Yi
db7f7b6d31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9
 2022-07-19 13:59:24 -07:00
TreeHugger Robot
377685d4a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-15 17:19:07 +00:00
Bill Yi
30c5704504 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
 2022-07-14 13:47:48 -07:00
Bill Yi
2ff486543a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I089f4ebab3776b2e32596948e43eb1564f38273d
 2022-07-14 13:28:43 -07:00
Treehugger Robot
52afebe91e Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Id7da7c8d7565087f996577689c7515b3094dcf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 12:23:06 +00:00
Treehugger Robot
2058af23ac Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7 Merge "Fix ExtraText lint errors" am: 000bc450b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 11:32:07 +00:00
Bill Yi
3d4eb4f4b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I043b44e648cce2709d66ea0b0cdc4c367de844d6
 2022-07-11 11:59:15 -07:00
Bill Yi
eda8321a12 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:06:38 +00:00
TreeHugger Robot
6f09916f9d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-07-05 00:45:36 +00:00
Bill Yi
d2b251ec36 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I750415ef848997b21de83b901e41bcf2b141777e
 2022-07-04 12:21:22 -07:00
Bill Yi
80c1acdaf0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8aeff68684c763f108bdba696080011e60301ad9
 2022-07-04 12:04:22 -07:00
Bill Yi
72d5864095 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
 2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
 2022-07-03 14:08:30 -07:00
TreeHugger Robot
2c5705010b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-01 06:33:55 +00:00
Joshua Mccloskey
c45744b895 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I85ffc3d2738d7398b261c48f27cf29c84c328f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 19:06:54 +00:00
Bill Yi
a140e645ff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib82da5ad9567b72f5a152893d397cafb736f0037
 2022-06-30 02:54:36 -07:00
Cole Faust
ad66ad55ca Fix ExtraText lint errors 
Android lint is being updated, and now
checks for extra text in android manifest
and resource xml files.

Bug: 236431222
Test: Presubmits
Change-Id: Ia74638562af2ba068546cb3c994e1f7f784cf663
 2022-06-29 12:20:39 -07:00
Joshua McCloskey
69cc573b76 Add field to control margin in FaceEnrollIntro 
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.

Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
 2022-06-29 19:07:44 +00:00
TreeHugger Robot
49a681bb37 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Bill Yi
382bed292d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
 2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
 2022-06-20 23:15:51 -07:00
Bill Yi
2652464d7c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I16bb20a52a58676aece02d01575bc32d710f5cd6
 2022-06-18 19:29:15 -07:00
Joshua McCloskey
27c5a5b804 Added face unicorn strings am: 66211d15bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I8a25346d1d9416a6c6099d1811ad04914793c231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:01:38 +00:00
Joshua McCloskey
66211d15bf Added face unicorn strings 
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
 2022-06-15 21:07:16 +00:00
Bill Yi
2609fb2ccb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
 2022-06-14 21:21:00 -07:00
Bill Yi
f84049c4e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iae080c4ad83f0090a8a4a6bcd2b2438564c563ec
 2022-06-13 17:00:54 -07:00
Bill Yi
7b831dc400 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie29078a0f8a50a373604db8dbd4fd2272426add7
 2022-06-11 13:26:42 -07:00
Joshua Mccloskey
6f430f8e66 Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I61bb8dcd5fb07d4493bfe6f140008e2567e923cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:37:36 +00:00
Joshua Mccloskey
02f0255b7a Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:29:29 +00:00
Joshua Mccloskey
9f1af4fc86 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: Idb03b051753fa418e8ffb40d6f2fbc1a7d7db287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:29:07 +00:00
Joshua Mccloskey
06b76edbb7 Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 16:27:59 +00:00
Joshua Mccloskey
52450aaa17 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev 2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d Merge "Updated FP enroll confirmation string" into tm-dev 2022-06-10 16:05:31 +00:00
Bill Yi
21559f3793 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Bill Yi
c1ebda67c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
 2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
 2022-06-09 09:45:40 -07:00
Bill Yi
307f491327 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
 2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
 2022-06-09 07:31:39 -07:00
TreeHugger Robot
f700b7398c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00