PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,677 Commits 1 Branch 0 Tags
c7560a39e8cb1521d3f9a86218dc4bf6831e4eec
Commit Graph

24179 Commits

Author SHA1 Message Date
Joe Bolinger
184e77a8d5 Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc am: 3452769f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I4e798fbebf3266b970fcb3d94c2390833541ba9d
 2021-09-14 23:28:11 +00:00
Joe Bolinger
3452769f1e Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I3dbb1da09fe9ea625b37cce6ae85262893900e30
 2021-09-14 22:23:25 +00:00
Joe Bolinger
63786513fc Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev 2021-09-14 22:08:23 +00:00
Joe Bolinger
8b3792d65b Add string ids to the result bundle for parental consent. 
Bug: 198491515
Test: N/A (builds)
Change-Id: Id120f5f7a7e923f9d3ce7dd38d3e5214296ca219
 2021-09-14 19:54:27 +00:00
Bill Yi
dfa9ca0dff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b28169e85744c126af035cae96f457b7d9471ea
 2021-09-11 09:11:27 +00:00
ykhung
bb535f4bce Move allowed list definition in the battery usage to feature provider am: b62cdecc67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
 2021-09-10 05:03:32 +00:00
ykhung
b62cdecc67 Move allowed list definition in the battery usage to feature provider 
Bug: 199367609
Test: make SettingsRoboTests
Change-Id: I321426e6ff1b9586ee493792f1d39aed35ecc34d
Signed-off-by: ykhung <ykhung@google.com>
 2021-09-10 01:29:32 +08:00
TreeHugger Robot
e1740e2faa Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 63a22fd735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: I69864e3efbdb8e191c5f098c004e5bee06f0351c
 2021-09-09 15:57:13 +00:00
TreeHugger Robot
88cd5025e1 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: If2c47f007a67865ad9aaf8040eddc638f46f7964
 2021-09-09 15:40:14 +00:00
TreeHugger Robot
63a22fd735 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
 2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev 2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5 Enhance battery settings limit charge tip 
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
 2021-09-09 22:13:33 +08:00
Yanting Yang
394f005c65 Merge "Update homepage icon of Safety & emergency" into sc-v2-dev am: 5891b736c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783148

Change-Id: I0303db74aee3e0fc0ea2f80a86a3eb958e331079
 2021-09-09 07:48:28 +00:00
Yanting Yang
5891b736c8 Merge "Update homepage icon of Safety & emergency" into sc-v2-dev 2021-09-09 07:28:38 +00:00
Yanting Yang
83b5a3e01b Update homepage icon of Safety & emergency 
Fixes: 197752821
Test: visual
Change-Id: Ib303b66fba556f0779f1c11033bf3c901b98101e
 2021-09-09 12:37:07 +08:00
Kevin Chyn
1b1c7ee277 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Icb0714151e308048598738e9a61607dc5361f6fe
 2021-09-08 08:51:24 +00:00
Kevin Chyn
cd2016c7a0 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ief10091c6a8fed52e87ea0da33bf24c0bad34ce8
 2021-09-08 08:26:47 +00:00
Kevin Chyn
49bbd5b893 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
 2021-09-08 08:25:40 +00:00
Kevin Chyn
0b40e09ba6 [DO NOT MERGE] Update enrollment edu asset 
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
 2021-09-08 00:09:13 -07:00
Kevin Chyn
df6ced6647 Update udfps lottie edu am: 2405b24311 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783457

Change-Id: I11688df2a12ac607aa9787dec8ee1900c33f56c5
 2021-09-08 07:03:16 +00:00
Kevin Chyn
2405b24311 Update udfps lottie edu 
Bug: 198858684
Test: Presubmit

Change-Id: Ic6e589ce738c8b1b82f892452518e4540a73f94b
 2021-09-07 22:42:12 -07:00
SongFerng Wang
12a16eb32d Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I558efa552f7c374dc980c85efbd8f1a9bbb3841f
 2021-09-08 04:03:02 +00:00
SongFerng Wang
fe74266ba4 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I176f6a1b4a7d1551c721a5d63bcaabd5666daf82
 2021-09-08 03:51:42 +00:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
 2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
Bill Yi
d770312ec1 Import translations. DO NOT MERGE ANYWHERE 
BUG:198847997

Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
 2021-09-07 23:51:36 +00:00
TreeHugger Robot
f999ee1943 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 am: fb39c456a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I6d2ec035cebe8796d7c785a3a155251c44be3641
 2021-09-07 20:58:26 +00:00
TreeHugger Robot
c6f7cf99e9 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I1a9d3533c92a0a97dc0e673e67a1f33f4ae3cd6a
 2021-09-07 20:42:27 +00:00
TreeHugger Robot
fb39c456a8 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
 2021-09-07 20:42:23 +00:00
Julia Reynolds
520c80d649 Add 'snoozing' to NLS consent dialog 
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
 2021-09-07 13:17:49 +00:00
TreeHugger Robot
89a745dd8c Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Idd2af151dcb4c0b8bb8f7fd04f8574544590b467
 2021-09-07 07:37:54 +00:00
TreeHugger Robot
f8bb8aced9 Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev 2021-09-07 07:27:05 +00:00
Jason Chiu
7426ab7b9f Define menu keys for highlighting the menu entry on 2-pane UI 
- Define an attribute for highlightable menu keys
- List the keys for Settings menu entries
- Support parsing the attribute

Bug: 199017944
Test: robotest
Change-Id: I5759bff591c79d498fffb8b2c2b57f2cb66c4421
 2021-09-07 06:32:19 +00:00
Presubmit Automerger Backend
d7e50f20fe [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc am: 585d501aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Change-Id: I61d4f0aedc979e9d6d79c8035bf7e441e68c0e7b
 2021-09-07 04:46:50 +00:00
SongFerngWang
eaa71ac6de [VoNR] VoNR settings 
Allow user to enable or disable voice over NR.

Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest

Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
 2021-09-07 10:57:34 +08:00
Presubmit Automerger Backend
585d501aff [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
 2021-09-07 01:57:06 +00:00
Presubmit Automerger Backend
4dde18fc09 [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Bug: 198858684
Change-Id: Ia1cb0bebbab85af8bda052e0c430527909949562
 2021-09-07 01:57:04 +00:00
Curtis Belmonte
e7849fb0dc RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll

Test: Manual

Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
 2021-09-06 18:56:38 -07:00
TreeHugger Robot
903293aa41 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485

Change-Id: I3c4676dfeb01743cd4aff1af440f1f819829a138
 2021-09-06 08:34:46 +00:00
TreeHugger Robot
2ff09ceeb7 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev 2021-09-06 08:10:21 +00:00
Betty Chang
3b1c25573b Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
 2021-09-06 04:16:51 +00:00
Betty Chang
ebdc0e26f6 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: I5a889a42d677e064b7ef553405fc0a19996961ad
 2021-09-06 04:12:50 +00:00
Betty Chang
edd650f6b5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
 2021-09-06 04:12:49 +00:00
Betty Chang
adc41a55d5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev 2021-09-06 04:00:59 +00:00
Sunny Shao
1564ef5ca1 Add more info on the dialog of AllowBindAppWidgetActivity 
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
 2021-09-06 11:52:51 +08:00
Curtis Belmonte
a8b2f6ac9d [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 am: 91cfb2c06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Id45643428f8f47f46171d035560dbede92720c8d
 2021-09-05 04:01:03 +00:00
Curtis Belmonte
9e3d13850e [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e7cd47b755b7a397e026acfb474d528911d8b39
 2021-09-05 03:49:02 +00:00
Curtis Belmonte
91cfb2c06c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
 2021-09-05 03:48:42 +00:00
Curtis Belmonte
4f2f0ed6d5 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
 2021-09-05 00:11:08 +00:00
Curtis Belmonte
a9c1fa626b [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
 2021-09-05 00:11:06 +00:00