Commit Graph

24197 Commits

Author SHA1 Message Date
TreeHugger Robot
24a1b8150b Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 am: 1fc8de7343
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: I62c2812fd8fc095bdf90ecf1595c62f1c42e953e
2021-09-22 09:31:12 +00:00
TreeHugger Robot
1fc8de7343 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: If671b194ea453ac406f280b5fdfe72d62cf1f550
2021-09-22 09:21:58 +00:00
TreeHugger Robot
85d20f5957 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev 2021-09-22 09:08:25 +00:00
Joshua Mccloskey
f73fad2d0f Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a am: 8aeeb6cd45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: I7699f33527edf8c395abb999767885b488fe0a58
2021-09-21 23:03:49 +00:00
Joshua Mccloskey
8aeeb6cd45 Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
2021-09-21 22:52:34 +00:00
Joshua Mccloskey
21ad438f6a Merge "Updated settings preference title for work profile" into sc-qpr1-dev 2021-09-21 22:39:56 +00:00
TreeHugger Robot
654c3279f9 Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa am: a82b6cd01e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I411ba36f37c5f9a79d47b9e27b60de6b44e3d62c
2021-09-20 19:53:04 +00:00
TreeHugger Robot
a82b6cd01e Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I211127b96a7f675dcf7b907d261a19d1311b33ea
2021-09-20 19:41:51 +00:00
TreeHugger Robot
9dbe775faa Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev 2021-09-20 19:19:54 +00:00
TreeHugger Robot
e9200b19ad Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-20 06:19:10 +00:00
Bill Yi
62814d9f22 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b0a170a252a9de2623da7a47afc456806c8b491
2021-09-18 17:24:49 +00:00
Bill Yi
918492ab2a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5565d21fd52770ff7a0a72e0eee23373b5bbb9cd
2021-09-18 17:12:15 +00:00
Joshua Duong
c960e8973a Fix QR code scanner layout in "Pair devices over Wi-Fi" page.
The toolbar needs to be disabled to remove the empty space at the top
of the page. Also added the landscape layout xml.

Bug: 193602141
Test: atest SettingsUnitTests and manual

Change-Id: I30368835979b360a8f09e16f70adf57064784517
(cherry picked from commit fd009229e5)
2021-09-17 15:36:32 +00:00
TreeHugger Robot
311e9b48aa Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d am: b96d734511
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: I571a1a9f628ce90dcc4b899ca421c044f4f7bdd7
2021-09-17 13:55:40 +00:00
TreeHugger Robot
b96d734511 Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: Id787a8b926cb5efdbdba91186135b5fd28fda743
2021-09-17 13:41:36 +00:00
Joshua Mccloskey
9f7c4cedea Updated settings preference title for work profile
Test: Verified string apperas in regular work settings.
Fixes: 193258818
Change-Id: I89671820a0bf900014567087e1e553e3ad7fe472
2021-09-17 02:07:53 +00:00
Julia Reynolds
faa7083c8b Shrink notification history views to fit
If an app hasn't posted many notifications, don't show extra whitespace
after its notifications

Test: manual, look at apps that have posted 1-3 notifications, and 10+
Fixes: 199944158
Change-Id: I8ed3e25cd35956eae9ce2fc5677710a34200bdfc
2021-09-16 21:01:43 +00:00
J. Eason
8b822858cf Fix Wireless debugging icon alignment on developer options screen.
Added icon and dividers to realign and balance the screen layout.

Bug: 200139203
Test: atest SettingsUnitTests and manual
Change-Id: Ie5e89fd952f85bdf3fe0009b25ff127493e3cb95
(cherry picked from commit 4677bfbe25)
2021-09-16 18:41:05 +00:00
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