Commit Graph

26787 Commits

Author SHA1 Message Date
TreeHugger Robot
0931e3895c Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a am: a51b1baeaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726

Change-Id: Ib9c678e1bcb7dcc562301a1f039f20eb7d3caccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 17:22:43 +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
Automerger Merge Worker
d4342e5483 Fix the font size inconsistency on "Erase all data" page.
Update "sud_layout_description" to "sud_layout_subtitle", because the
"sud_layout_description" is outdated and working not as expected.

Bug: 235315492
Test: Manually test on device
Change-Id: Ic48282e4cbcbff6e0bf2c27f512123770cce0788
2022-07-07 02:21:11 +00: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
Bill Yi
9fc986d019 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
Bill Yi
308b5d00e9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
TreeHugger Robot
f29e93bf9e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-05 07:47:58 +00:00
Peter_Liang
772e114438 Avoid the reset item having inconsistent alignment with the others under SuW.
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences.

Bug: 232528123
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest
Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
2022-07-05 15:32:37 +08: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
d2b24bfc0a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I72c40ddf49236c03bb2c8834bb95bc6444a6ab4c
2022-07-04 12:08:29 -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
0ea30d1b60 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7c8f0cae83145c94ea3d9aae8d9a85fe2d64aeb7
2022-07-04 11:58:57 -07:00
Bill Yi
d446624f2e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-01 04:32:33 +00: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
3ce8497117 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774 am: 8b6d40e167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ie326332cdc12df4a4946cde970a3016ebd9d2f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:49:16 +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
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
1f30e66ce1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I374017b14f84a2e6ab4c1fc54157c161c5a14231
2022-06-30 02:58:37 -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
Menghan Li
9450735e38 Merge "Refactor CaptionPropertiesFragment to improve maintainability" 2022-06-30 03:48:33 +00:00
menghanli
1d26b6d898 Refactor CaptionPropertiesFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionPropertiesFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionPropertiesFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPropertiesFragmentTest CaptionTogglePreferenceControllerTest
Change-Id: I7013a7aa284b587c329c2e678dbb079e553ea94d
2022-06-30 09:01:13 +08:00
menghanli
deb72e29ef Refactor CaptionMoreOptionsFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionMoreOptionsFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionMoreOptionsFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionMoreOptionsFragmentTest CaptionLocalePreferenceControllerTest
Change-Id: Ifdf3e22b027328a9f8eb13d756730ca047ece047
2022-06-30 00:16:19 +00: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
Chaohui Wang
486fb055f6 Clean up unused resources
gesture_ambient_tap & auto_aewsome_battery

Bug: 234570979
Test: TAP
Change-Id: I7213cd67c4185f820b4dbe69469c827f74b5f37a
2022-06-26 19:10:17 +08:00
Aleksandar Kiridžić
2050925500 Merge "speech: Add on-device speech recognition settings entry" 2022-06-24 15:59:08 +00:00
TreeHugger Robot
49a681bb37 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Sunny Shao
d46dff8d4f Fix UI flicker problem and update wordings
- "Set time zone automatically" changes to "Set automatically".
- "Use location to set time zone" changes to "Use location"
- Add a new summary text with "Location may be used to set time zone".

Fixes: 233968737
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.datetime
Change-Id: Ia16c428e906cda4ebe052bad83c3f574075a7a64
2022-06-23 10:52:23 +08: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
10392980a1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-21 02:32:14 +00:00
Zaiyue Xue
7e6aa69cca Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2 am: 6470ada117
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3d6a155e80a5d54c309061c41d0b6436e61cc4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:42:01 +00: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
Aleksandar Kiridzic
31473663f5 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
2022-06-20 08:48:10 +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
Bill Yi
516cb3d118 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I26753823c3bfc60fcb0bdd88c872c40da02443c3
2022-06-18 19:15:48 -07:00
TreeHugger Robot
652e9ef651 Merge "Add "AOD" into searching keywords" 2022-06-16 09:43:03 +00:00
Sunny Shao
4150c5fcda Add "AOD" into searching keywords
Fixes: 211782678
Test: manual test
Change-Id: I3125b9d82e48a6d4aee8c8682a4ebc0fa69f7707
2022-06-16 15:28:05 +08:00
Joshua McCloskey
10ccb0b984 Added face unicorn strings am: 66211d15bf am: 909913ffc1 am: 4be235f6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

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