Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,100 Commits 1 Branch 0 Tags
bbdf7e6d0423bbbfc9fdabcc5d72fc5749502fa8
Commit Graph

24024 Commits

Author SHA1 Message Date
Julia Reynolds
fd8aa833cf Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: b03f1946c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Ieaec6e4e30244a9ab4611b8c738d502d2218bca4
 2021-06-07 15:22:15 +00:00
Julia Reynolds
6d6280c634 Merge changes I31066a6f,I081cea0d into sc-dev 
* changes:
  Fix broken test
  Updates to conversation page
 2021-06-07 14:50:00 +00:00
Matt Casey
d476ffd3de Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 5e6d42bf1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: Iddad11b138f58708d1b3927feb1c6c3b9a67558a
 2021-06-07 14:47:15 +00:00
Matt Casey
bd1c4e5fa1 Merge "Fix typo in setting description." into sc-dev 2021-06-07 14:17:15 +00:00
Matt Casey
7364e42f74 Fix typo in setting description. 
Repeated word

Test: None
Bug: 179673792
Change-Id: Iee75c37fce90e1c05f651d741374029c213fa0f0
 2021-06-07 14:17:03 +00:00
TreeHugger Robot
4d45474cc9 Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060 am: 326d9d2129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Idc82b6b47ee782dd5462198edc3a04861f0fa9a0
 2021-06-07 14:16:34 +00:00
TreeHugger Robot
5484fd3060 Merge "Revert DND toggle back to a button" into sc-dev 2021-06-07 13:40:54 +00:00
Yanting Yang
154e9a0b31 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: 8cb77c6609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: I513c48904601cb376de0ee50277a21a0c452821b
 2021-06-07 11:21:28 +00:00
Yanting Yang
8b3f0e8d52 Merge "Update homepage summaries" into sc-dev 2021-06-07 10:55:08 +00:00
TreeHugger Robot
ef6e2fa01a Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: aba2346cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: I6fca72be41d2c2e0f5528fbf2a7e47660e92ffbf
 2021-06-07 09:16:37 +00:00
TreeHugger Robot
d29e28ed5b Merge "Rename Wi-Fi switch controller's key" into sc-dev 2021-06-07 08:48:37 +00:00
Stanley Wang
1318447470 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565 am: ab629099ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I3f7d05cdfa0aa36552482cb10d48d9398b022874
 2021-06-07 08:34:00 +00:00
Stanley Wang
ab629099ed Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I5b99eced55bc34b20fbe32d8bec158ea7e44a8bf
 2021-06-07 08:19:46 +00:00
TreeHugger Robot
e4748374d0 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 am: b4968ee8b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: Ia0dd78b43874cc24ac92402e96baa712967f434c
 2021-06-07 08:12:57 +00:00
Stanley Wang
1d60ddea0c Merge "Update the Bubbles page." into sc-dev 2021-06-07 08:04:03 +00:00
TreeHugger Robot
8c3f175a04 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: I29ee837a1674349c1db05f254808879572d84521
 2021-06-07 07:57:52 +00:00
TreeHugger Robot
8fdc0b9d32 Merge "Increase the maximum height of panel fragment" into sc-dev 2021-06-07 07:38:45 +00:00
Jason Chiu
fe01ecc052 Rename Wi-Fi switch controller's key 
Leverage the key of WifiPrimarySwitchPreferenceController for Settings
Search mapping it to the slice

Bug: 186181785
Test: manual, robotest
Change-Id: I1372afff93f01505c377e94b648e6f8dcbbafe54
 2021-06-07 15:08:59 +08:00
TreeHugger Robot
64d8b0e787 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-07 05:06:47 +00:00
TreeHugger Robot
0bf071e6c0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-07 04:49:27 +00:00
TreeHugger Robot
17c5234bca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:46:26 +00:00
TreeHugger Robot
0f95249651 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:42:56 +00:00
Bill Yi
ad2c686b48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ce668c4a4c8f7f14cd0173645350fd3318163c9
 2021-06-07 03:47:17 +00:00
Bill Yi
992779a314 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icc1570ae783b997b29745659bf593fd648b1959a
 2021-06-07 03:43:26 +00:00
Bill Yi
a4bf78bdd9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ife555b09b530f7960547bdf0e715819f42fd2e3f
 2021-06-07 03:38:35 +00:00
Bill Yi
86eb42fb68 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I708fb20bc730db9951edde212e2b9bea92a66d75
 2021-06-07 03:37:05 +00:00
TreeHugger Robot
9b813bee31 Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f am: cb0a247abf am: a75a39701c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I2e239eed7eaa95c73a4591f9f9ebdeecd49394d1
 2021-06-07 03:32:42 +00:00
TreeHugger Robot
cb0a247abf Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: Ife95f2185be80d42d377aebcfd2cfce0be97005a
 2021-06-07 02:51:11 +00:00
TreeHugger Robot
b734aa3f7f Merge "Add key for StorageDashboardFragment" into sc-dev 2021-06-07 02:37:51 +00:00
Yanting Yang
3e2313e958 Update homepage summaries 
- Network & internet
- Connected devices
- Display
- Wallpaper & style
- Accessibility
- Tips & support
- Also clear the redundant codes and tests.

Fixes: 183642373
Fixes: 189981034
Fixes: 190011428
Fixes: 190015037
Test: robotests & visual
Change-Id: Ide19fa5aff67e093d86b259c5e7a307b9ad37550
 2021-06-06 12:28:03 +08:00
Kevin Chyn
d0b69e24b1 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: e926e6757f am: c9ef612518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: I5f63620ddbcaf0856ad309080bf4908862461272
 2021-06-05 00:12:58 +00:00
Kevin Chyn
c9ef612518 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: e926e6757f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: Ifa515fe41d6c0ea2d94a9d4567b7da80a9625cb2
 2021-06-04 23:58:19 +00:00
Kevin Chyn
e926e6757f Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: I301973cb4053811181a9c7564e739317fa8c45b8
 2021-06-04 23:44:01 +00:00
Kevin Chyn
0a8fcd8fe9 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764

Change-Id: Id795687f5bc58a57a75f8222030f220a46f1988b
 2021-06-04 23:41:23 +00:00
Kevin Chyn
4a0a03f0e4 Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev 
* changes:
  Update fingerprint/face enrollment to lock icon
  Update fingerprint intro drawable
  Remove SUW-specific fingerprint enroll description
 2021-06-04 23:26:19 +00:00
Chloris Kuo
80d21be186 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: 7327a3426d am: e83a9465b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: Id7a47696bcdd5a3389e407833c9dda6189fb821f
 2021-06-04 21:10:58 +00:00
Chloris Kuo
e83a9465b2 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: 7327a3426d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I4146ddd2a733f32aae801bcc2a2475054204276e
 2021-06-04 20:55:40 +00:00
Chloris Kuo
7327a3426d Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I7369b7103d64a354574ae87dbc2eecb01788029a
 2021-06-04 20:41:33 +00:00
Chloris Kuo
d07a484c46 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751

Change-Id: I02e0e2ff3b9d6012a3ada8b215f79eec4e844c3b
 2021-06-04 20:39:39 +00:00
Chloris Kuo
f9bde76ab9 Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev 2021-06-04 20:27:46 +00:00
Kevin Chyn
ade59af392 Update fingerprint/face enrollment to lock icon 
Bug: 187460696
Test: manual
Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6
 2021-06-04 12:49:31 -07:00
Kevin Chyn
3e27fd8752 Update fingerprint intro drawable 
Bug: 187460696
Test: manual

Change-Id: I92ae38b8851be1e1ad91c9723264249424b9078d
 2021-06-04 12:49:23 -07:00
Kevin Chyn
47257c05c8 Remove SUW-specific fingerprint enroll description 
Bug: b/187460696
Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity
Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd
 2021-06-04 12:47:35 -07:00
Chloris Kuo
5028e6e6a6 Fix NotificationAssistantPreferenceController constructor 
Fix flaky test due to the constructor must either only take Context, or
(Context, String).

Bug: 187998873
Test: CodeInspectionTest, NotificationAssistantPreferenceControllerTest
Change-Id: Ie383ea6773afda05adfb7aa9d7de9e27676f6b29
 2021-06-04 11:39:36 -07:00
Weng Su
e7124d8cb1 Increase the maximum height of panel fragment 
- Need to increase the panel size to show more slice rows

Bug: 189912933
Test: manual test
make RunSettingsRoboTests

Change-Id: I35e2933b4df25e84928d21493a2fc3754bf064fb
 2021-06-04 21:31:11 +08:00
TreeHugger Robot
549dac0dc3 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 1a181a3239 am: e6c6db1f61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: I321a39dc2d76d16a8f4551f7e5157a0d1a1fc7b3
 2021-06-04 12:04:29 +00:00
TreeHugger Robot
e6c6db1f61 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 1a181a3239 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: Iaeae2fa4a87f76f86ca061306ac96915c5fdf9fd
 2021-06-04 11:43:28 +00:00
TreeHugger Robot
1a181a3239 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: I998d4981c82300ae92134f9fd71d6dded45af483
 2021-06-04 11:30:19 +00:00
TreeHugger Robot
017de20112 Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155

Change-Id: Ic8a5886cd19213cc4fe54157fa441b107e1db15c
 2021-06-04 11:26:14 +00:00
TreeHugger Robot
03d4644673 Merge "Storage Settings hides categories when loading" into sc-dev 2021-06-04 11:09:01 +00:00