Curtis Belmonte
474fba01f1
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
2021-08-17 01:01:47 +00:00
Curtis Belmonte
2b318b3b69
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp
...
* changes:
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
2021-08-17 00:47:58 +00:00
Yomna Nasser
da6c658b99
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
2021-08-17 00:43:26 +00:00
Yomna Nasser
87259ab2af
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I04e70b72a0c2cd197ae993139c9fb60b01a07a23
2021-08-17 00:29:43 +00:00
Yomna Nasser
cf77b7a248
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev
2021-08-17 00:12:39 +00:00
Curtis Belmonte
dbef2415d3
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
TreeHugger Robot
f680c9b0b5
Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055
Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
TreeHugger Robot
737f4d76c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:45:05 +00:00
Alfred Lin
7f8e775754
Prototyping : Demo Image on color setting
...
Implement prototyping of demo image on color setting
Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
Bill Yi
d486302dc9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
2021-08-13 03:48:58 +00:00
Bill Yi
f30152962c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
2021-08-13 03:42:27 +00:00
Bill Yi
d9ba125bb8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
2021-08-13 03:32:57 +00:00
Julia Reynolds
273df63430
Limit the number of concurrent notifs appear on screen am: abe9246caa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757
Change-Id: I686166bf858ec7fde221e76b28c8280decc9ec13
2021-08-11 22:31:14 +00:00
Julia Reynolds
abe9246caa
Limit the number of concurrent notifs appear on screen
...
To avoid an ANR in notification history
Test: Manual; with an app with 10k recent notifications
Bug: 183712803
Change-Id: Ia1340accadf43620c7b5a2c94ca1032cfe49ea59
2021-08-11 20:22:53 +00:00
TreeHugger Robot
57641d0db8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:35 +00:00
TreeHugger Robot
9aa8b8906e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-10 19:25:19 +00:00
Bill Yi
385f45f7a0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebb44c911ceb4598c1653402af1d3b91b2b62a55
2021-08-10 15:29:49 +00:00
Bill Yi
2c121e8336
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I905ee0fb3da18a7bd2311f97da60b7735a36678a
2021-08-10 15:23:37 +00:00
TreeHugger Robot
a03d9cee0b
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I016bb3be3c99196c609a41903f3782cc9a73c458
2021-08-09 20:19:21 +00:00
TreeHugger Robot
9000bdc25f
Merge "The wifi dialog text should be Google Sans Text" into sc-dev
2021-08-09 19:59:07 +00:00
Weng Su
83ccc8f7c5
The wifi dialog text should be Google Sans Text
...
- Add fontFamily to override the "google-sans-text" font for SUW theme
only.
Bug: 195089787
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I578658fc82ad4d25e5e2e57868cd3aeecb2ab37f
2021-08-09 15:19:31 +08:00
Yomna Nasser
e00b6cfa4c
Move "Allow 2G" controller under DisabledSubscriptionController.
...
Bug: 195576795
Test: manual
Change-Id: Ib42df245394bfbebc832f421ebd6c49bc2dc88d4
2021-08-08 20:08:18 +00:00
TreeHugger Robot
c47427811f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-05 05:02:21 +00:00
Bill Yi
0b227f30a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28fd41e071cad5ba1955fe0aa17bec63c5d3b92
2021-08-05 02:58:44 +00:00
TreeHugger Robot
26aa201d81
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9
2021-08-04 23:55:03 +00:00
TreeHugger Robot
66a2f625e4
Merge "Fix text styling for choose pattern/password screens" into sc-dev
2021-08-04 23:44:35 +00:00
Curtis Belmonte
6ee789e380
Fix text styling for choose pattern/password screens
...
Test: Manually trigger SUW and set a device pattern
Fixes: 195069195
Change-Id: Ib19fd0e827af5bdc0896ab4c8cc4fdb8f582cf71
2021-08-04 15:14:38 -07:00
Bill Yi
63c32865cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
TreeHugger Robot
14073ffdbb
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I0bc2e0daa4d6b8a5f404d853bf92999e42ef4a9b
2021-07-29 15:20:30 +00:00
TreeHugger Robot
68d15388f4
Merge "Update the "Location services" header to be sentence case" into sc-dev
2021-07-29 15:06:45 +00:00
Yu-Han Yang
1043fd1cf5
Update the "Location services" header to be sentence case
...
Bug: 191300716
Test: string update only
Change-Id: Ib1194847b9d2b817fa1b8581dc62cd2c1d85da26
2021-07-28 13:01:18 -07:00
Joe Bolinger
1841f0f132
Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293
Change-Id: I2c400fb7daffee7abf6e1df4a3636e593b13586e
2021-07-27 17:41:42 +00:00
Joe Bolinger
7e9077fd14
Merge "Use RestrictedPreference for all biometric settings." into sc-dev
2021-07-27 17:25:25 +00:00
Bill Yi
12b1ae00b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d8bd7744e7bcc261f6745c70584860391e423f2
2021-07-27 03:39:15 +00:00
Joe Bolinger
61d998406d
Use RestrictedPreference for all biometric settings.
...
Fix hardcoded preference key in settings controller.
Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
2021-07-26 18:36:32 -07:00
TreeHugger Robot
7dd70398eb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-24 02:14:45 +00:00
TreeHugger Robot
bfd21817e8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-24 02:06:59 +00:00
Bill Yi
1bc47cf620
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36edea8f82684c7c284252887a162407ec521b83
2021-07-24 00:32:29 +00:00
Bill Yi
9a92a9ffb2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib7fca4d552a4ba46311203fa574f8b7b0f280534
2021-07-24 00:22:54 +00:00
TreeHugger Robot
b85bff0ec2
Merge "[Provider Model] Set unsearchable for unpublished item" into sc-dev am: 7c55ea3fc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360456
Change-Id: Ie5f1deb1df160f1791adcaf8c1ae8af1d3ac726f
2021-07-23 13:47:12 +00:00
TreeHugger Robot
7c55ea3fc0
Merge "[Provider Model] Set unsearchable for unpublished item" into sc-dev
2021-07-23 13:27:42 +00:00
SongFerng Wang
9b1493a789
Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173
Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
Weng Su
faf97a4296
[Provider Model] Set unsearchable for unpublished item
...
Bug: 194465708
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: I024253079b25477bd7eb2d308ad69ce1d9158257
2021-07-23 17:13:30 +08:00
SongFerngWang
7f5c984655
aggregate the items of network selection list
...
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest
Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00
YUKAI HUNG
65bdf5f805
Merge "Remove items from not allowed show summary list (legacy rule)" into sc-dev am: d7753f4c23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343066
Change-Id: Ieb8ff72560d7b2a0eecb5ba27265e76b277b2246
2021-07-21 13:20:19 +00:00
YUKAI HUNG
d7753f4c23
Merge "Remove items from not allowed show summary list (legacy rule)" into sc-dev
2021-07-21 13:07:19 +00:00
TreeHugger Robot
f97a194881
Merge "Update dark theme battery info error text color" into sc-dev am: 501a4cea3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15308397
Change-Id: I4df788647ce68c6043b876345d4753f7fbae6555
2021-07-21 10:57:00 +00:00
TreeHugger Robot
501a4cea3b
Merge "Update dark theme battery info error text color" into sc-dev
2021-07-21 10:47:56 +00:00