Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,060 Commits 1 Branch 0 Tags
3bee7b4763688e4f8eaf1283481bac8a932c6607
Commit Graph

28550 Commits

Author SHA1 Message Date
Ioana Alexandru
e230f326c3 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 am: 164ef2bc06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I9b96ca99ca659df6cd75f748d5031494bbe24d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:57:22 +00:00
Ioana Alexandru
164ef2bc06 Merge "Clarify notifications behavior in bypass setting." into udc-dev am: f8662a4f40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22195537

Change-Id: I10ddb90f41cbaf022d5d90777477c44b6cff03a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:38:52 +00:00
Ioana Alexandru
f8662a4f40 Merge "Clarify notifications behavior in bypass setting." into udc-dev 2023-03-23 17:53:25 +00:00
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
be92dd1c63 Merge "Update battery settings page footer string" into udc-dev am: 72690c6844 am: 1db438deff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214369

Change-Id: Ib86145330314f39724c2b9d2725f4dc1846ecf58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 17:00:11 +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
7289091af5 Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev am: cb227a79a2 am: 0e59c79809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071823

Change-Id: Id9dcbb5146408641a74377b88c75192be00f937a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 12:11:46 +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
Jason Hsu
3a3b673f5e Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8 am: f6d4ab89ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384

Change-Id: I4cdee0dd868e33d0db5bd83d5e055078ea8bba6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 01:40:08 +00:00
Wu Ahan
d49f7cf8ef Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f am: 0067e9581b am: 2034c0c395 am: 05f2c3221a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: Ie3e516ae433f022131e148f5f4e1b9be43c17b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 23:02:29 +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
8f6a04e78e Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc am: 810c487324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492

Change-Id: Ic326044595bd9acffd3fa7efcc4dd3c42259cb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 13:02:48 +00:00
Ioana Alexandru
8780480074 Clarify notifications behavior in bypass setting. 
This will likely be temporary as we're exploring actually displaying
notifications properly on the lockscreen (b/266423709), but that will
take a while. In the meantime, users are often confused about not seeing
notifications on the lockscreen, as that's an unexpected side effect of
enabling bypass. This should at least make that less unexpected (for
users who read the settings, at least).

I used a string already defined in a device-specific directory, and
removed that one since it applies to all devices (see other CL in
topic).

Bug: 269701672
Test: verified that the string is updated
Change-Id: I3abc6a5e1f8ee7e2f0cba3495925faf50f476e21
 2023-03-22 12:54:31 +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
48c6c67a92 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 am: 1795481a72 am: 40019f876b am: f464edf6dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I80a47fa5bb067c4aae33fdb72e568d5022412cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 19:44:49 +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
f464edf6dc 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: I54c8118e05f1c17662bac7eb5260aaa544b3b7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 19:04:37 +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
Becca Hughes
a917128931 Merge "Add settings intent dialog" 2023-03-21 15:58:37 +00:00
Jason Hsu
61d3f30778 Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71 am: 8f565dda10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162

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

Change-Id: I102f8f24c8dfbebae6a1751cc8ca23fd04d6dd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:33:27 +00:00
Jason Hsu
8f565dda10 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: I3bfe7886f3dee0407faa357cb3cae58e1914ee9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:00:04 +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
e5ce1ad6e1 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: If14fcbfa4efa74e7551d192891033fe71ba1e371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:57:08 +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