Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,080 Commits 1 Branch 0 Tags
bcc4a3b4e6bf82ac5ffa1e2aea3a2d1b7dca7e4e
Commit Graph

26285 Commits

Author SHA1 Message Date
Treehugger Robot
bcc4a3b4e6 Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac am: 52afebe91e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I29468d623adeb7f25bc4e20dcca7e3e6c3e2509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 12:40:10 +00: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
TreeHugger Robot
a51b1baeaa Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726

Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 16:54:06 +00:00
TreeHugger Robot
fedab69c9a Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev 2022-07-12 16:40:32 +00:00
Hugh Chen
95d2add6a2 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588

Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev 2022-07-11 22:50:58 +00:00
ykhung
764d513d00 Support multi-user privacy for battery usage chart 
When there are multiple accounts in the devices, the battery usage list
is shared in the current design. We will aggregate other users usage
data into a single item to support multi-user privacy requirements

Screenshot: https://screenshot.googleplex.com/AkFTUtNvnoxcuGR

Bug: 202119550
Test: make RunSettingsRoboTests
Change-Id: I6cb55f0d50a4caca83212a0a54410530a032c089
 2022-07-12 00:17:43 +08:00
Aleksandar Kiridžić
1a508148ad Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev am: 7914c77660 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19138106

Change-Id: I3bcdd2d794f7a3f78e24db4e3423583f00b7c297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 18:20:23 +00:00
Aleksandar Kiridžić
7914c77660 Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev 2022-07-06 18:01:48 +00:00
TreeHugger Robot
f29e93bf9e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-05 07:47:58 +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
b4523a0392 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28a1a8af7e44edb875d10d7cc989e1521108aafb
 2022-07-04 12:17:11 -07:00
Bill Yi
b8ae8cd5c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97697f451f1420bccede0fe8d345c2c02146c6f0
 2022-07-04 12:02:33 -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
c037a7c811 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-01 03:11:28 +00:00
TreeHugger Robot
10f1d35eef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-01 03:11:28 +00:00
Joshua Mccloskey
8b6d40e167 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I4513264127184a92320636fee5cdf48e84ec7752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 19:31:30 +00:00
Aleksandar Kiridzic
82ef1ef6db speech: Add on-device speech recognition settings entry 
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
(cherry picked from commit 31473663f5)
 2022-06-30 19:12:07 +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
Joshua Mccloskey
93f79d6774 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: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 19:06:42 +00:00
Bill Yi
ac73a2f10f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I828baaa165b4b83e91890f75779f3d2681d81f88
 2022-06-30 03:06:58 -07:00
Bill Yi
d642b8754c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idaa60c0a1a599d60559c2610ffee17880bc5763b
 2022-06-30 02:52:59 -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
Zaiyue Xue
6470ada117 Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:32:47 +00:00
Zaiyue Xue
3b7953eac2 Merge "Move battery usage files to a separate folder." into tm-qpr-dev 2022-06-20 09:12:04 +00:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder. 
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
 2022-06-19 05:59:35 +00: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
Bill Yi
cc8d8e568a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id834260c1bbd63b31793705e5fb0b22838d9d729
 2022-06-18 19:24:50 -07:00
Joshua McCloskey
4be235f6a8 Added face unicorn strings am: 66211d15bf am: 909913ffc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I30ce8688e2a51a3748559dbf5c29a8c0779a52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:17:24 +00: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
909913ffc1 Added face unicorn strings am: 66211d15bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:01:36 +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
TreeHugger Robot
3d8b8de2be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-13 16:40:31 +00: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
Bill Yi
3a3ba24088 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I417d9be4714e60a9e7a36c56e7bd9c8fbb620a89
 2022-06-11 13:22:08 -07:00
Bill Yi
77b66b7495 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
 2022-06-11 13:07:25 -07:00
Milton Wu
b6fbd10af4 Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041

Change-Id: I61ce4d033c1f4cfa57347ad781c2ecbce4da20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:40:24 +00:00
Milton Wu
75d49b02bc Merge "Update SUW fingerprint string" into tm-qpr-dev 2022-06-10 17:33:44 +00:00
Joshua Mccloskey
74d3ba859f Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a am: 62db0f71bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

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

Change-Id: I2a53040c4a9a4afee0815c2791a2d381b3dfa993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 17:03:11 +00: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