Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,117 Commits 1 Branch 0 Tags
569ceb7d563ac53c44e3fddc7aabb246bee49872
Commit Graph

28425 Commits

Author SHA1 Message Date
Becca Hughes
7b1a81e0a6 Merge "Add settings intent dialog" into udc-dev am: cbbab3632c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22181848

Change-Id: Ic3a96a9930c11a5420c0a8109171283fb5bde14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:40:15 +00:00
Becca Hughes
cbbab3632c Merge "Add settings intent dialog" into udc-dev 2023-03-23 17:07:56 +00:00
YK Hung
1db438deff Merge "Update battery settings page footer string" into udc-dev am: 72690c6844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Iadb81f33606f807c60085e67429bfc04871d14b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 16:20:31 +00:00
YK Hung
72690c6844 Merge "Update battery settings page footer string" into udc-dev 2023-03-23 15:55:03 +00:00
Alexander Milantev
0e59c79809 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Iff5c7efa1738ec452ed9327ab3f738450a7c989d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 11:35:13 +00:00
Alexander Milantev
cb227a79a2 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev 2023-03-23 10:44:28 +00:00
Wesley Wang
c81b12aabf Update battery settings page footer string 
screenshot: https://screenshot.googleplex.com/4LdASHFSS23Q5NK.png

Bug: 274871896
Fix: 274871896
Test: make SettingsRoboTests
Change-Id: Ia739e5b004755a16fb80d460657bcffcb40404f9
 2023-03-23 17:01:42 +08:00
TreeHugger Robot
8abdce5cba Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-23 05:56:21 +00:00
TreeHugger Robot
419d424c0b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-23 05:41:57 +00:00
TreeHugger Robot
b7c595c4de Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-23 05:37:26 +00:00
TreeHugger Robot
fad707affb Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-23 05:28:39 +00:00
Bill Yi
b11c37e6f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d632ac17ae813042eeaa5b8a80270127c40b295
 2023-03-22 12:28:35 -07:00
Bill Yi
4bf6f099aa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I72cf106bca67ce25cc517ac76700e5262e8764dd
 2023-03-22 12:25:27 -07:00
Jason Hsu
f6d4ab89ef Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384

Change-Id: I60b087e91930bcabaa3a8c07d0bd5ca1f77e67e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 18:03:43 +00:00
Jason Hsu
72237b55f8 Merge "Correct the char limit for strings" into udc-dev 2023-03-22 17:32:55 +00:00
jasonwshsu
e621a54f0a Correct the char limit for strings 
* string: bluetooth_system_sounds_title is too long to fit in one line.
  Should allow more char limit to two lines.

Bug: 270086620
Test: flash rom and check UI
Change-Id: I8b0c8ca37fc3b7447da3dba3bca66673b4d05f7a
 2023-03-23 01:25:19 +08:00
Bill Yi
92036d6746 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I794823282def77b9650cd340a87826abe8ad55e0
 2023-03-22 08:47:51 -07:00
Bill Yi
ce38438c35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id19a8c0405a768f79e6c68612d29d17c65e94422
 2023-03-22 08:39:49 -07:00
Wu Ahan
05f2c3221a Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b am: 2034c0c395 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: I35e2ec89a87304caf2002c674e0f71ad87ad47a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 14:46:00 +00:00
Alexander Milantev
c413b3e8e0 Enabled Settings Core activity embedding for Assistant 
Test: manual
Bug: 271260497

Change-Id: Ia5c308a45f4b0bde902c22da5352510413fbf018
 2023-03-22 14:40:46 +00:00
Wu Ahan
2034c0c395 Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: I19a4ecd726bf1e6b059909fcb274f2d2cc080fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 14:02:36 +00:00
Wu Ahan
0067e9581b Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 13:44:52 +00:00
TreeHugger Robot
810c487324 Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492

Change-Id: I4db97fde3b3c365b7c50a5f1e02f56aa1654760b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 12:26:50 +00:00
TreeHugger Robot
a311ae81fc Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev 2023-03-22 11:40:57 +00:00
Wu Ahan
3a2ef6db2f Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev 2023-03-22 03:46:30 +00:00
Becca Hughes
b5f8ba6945 Add settings intent dialog 
Add a dialog that can be launched via
an intent to prompt the user to enable
the provider for credman.

Test: make & atest & manual
Bug: 267816998
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9d74509888b7dd65b287bc68b9445d9e23809cce)
Merged-In: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32

Change-Id: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32
 2023-03-21 22:07:29 +00:00
Sally Yuen
877a6ffa82 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I907ff8fc461c9fb9c2965e2c30dc6721cc3c09a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 19:08:40 +00:00
Sally Yuen
40019f876b Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: Ib68b4ee9ecbd90f565eb57ceed0e8d2eb445864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:24:43 +00:00
Sally Yuen
1795481a72 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9 Merge "Update Extra dim banner for tablets" into tm-qpr-dev 2023-03-21 16:33:06 +00:00
Jason Hsu
5413c0269c Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

Change-Id: I56b833f5f55d67bbb99db68d7ede97e0ee21873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:59:42 +00:00
Jason Hsu
fff9b76baf Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: Id654d152809446154b53faa7d84010e650b3b08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:57:18 +00:00
Jason Hsu
bff222ca71 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev 2023-03-21 11:39:44 +00:00
Jason Hsu
b25a941609 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev 2023-03-21 11:38:02 +00:00
Matías Hernández
07394b0fdc Fix icons of DND timelapse/event schedule types in Dark Mode 
Instead of a fixed white color, use a theme-dependent one. Also renamed the drawables themselves since they are no longer "_white".

Fixes: 214789556
Test: Manual
Change-Id: I94d7d0308a339385988d3bb39182b2e2d2f0c3a1
 2023-03-21 11:56:16 +01:00
Angela Wang
2b1e10e613 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: I6fb33eaa0cb8768c0a9fa123ee3c951d68456cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:26:28 +00:00
Angela Wang
6dfcad2cb2 Merge "Adds illustration to Flash Notifications settings page" into udc-dev 2023-03-21 08:44:04 +00:00
jasonwshsu
fd76efc7fd Update the strings for bluetooth hearing device details page in U 
Bug: 270086620
Test: flash rom and check the device details page UI for hearing device
Change-Id: Iae1a7fae9f51ed8318d757ed7b3eefe0261b28a1
 2023-03-21 15:10:38 +08:00
Ahan Wu
ae84ac3530 Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment 
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.

Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
 2023-03-21 06:27:51 +00:00
Angela Wang
139ee5037b Adds illustration to Flash Notifications settings page 
Bug: 274546785
Test: builds and checks the illustration manually
Change-Id: Iaaa49195fc062b2905b148352a5bd3e25807f207
 2023-03-21 05:11:45 +00:00
Julia Reynolds
78dbfb94aa Merge "Add missing conversation field" into udc-dev am: 2494fd0187 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: Ic759afca2df0e760b699ef237beb18cc06df69a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 15:10:21 +00:00
Julia Reynolds
2494fd0187 Merge "Add missing conversation field" into udc-dev 2023-03-20 14:28:41 +00:00
jasonwshsu
6c3805288b Update to use android:summary="%s" in ListPreference 
* No need to call updateState() in onPreferenceChange()

Bug: 274326713
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(AccessibilityButtonGesturePreferenceControllerTest|CaptioningLocalePreferenceControllerTest|CaptioningFontSizeControllerTest|CaptioningTypefaceControllerTest|AccessibilityButtonLocationPreferenceControllerTest|FloatingMenuSizePreferenceControllerTest|SelectLongPressTimeoutPreferenceControllerTest)"
Change-Id: I14a87597a44c5500ff7e676664b67feb9c352494
 2023-03-20 21:24:02 +08:00
Julia Reynolds
5164149efc Add missing conversation field 
NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.

Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155

Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
 2023-03-20 13:04:11 +00:00
Betty Chang
aa7ec2d5fe Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497

Change-Id: I7f299924d39ddc0952b301e622e4009064e923f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:29:38 +00:00
changbetty
7cf90fbe36 [LE Audio] Set activity for result after scanning the QR code 
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
 2023-03-20 06:48:36 +00:00
Bill Yi
77b98813c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Jason Chang
9b94df1d40 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ia34c19988e286741df8aee146e15e9df1e2c2ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:44:39 +00:00
Jason Chang
9522a44bb6 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev 2023-03-18 14:10:58 +00:00