Commit Graph

88237 Commits

Author SHA1 Message Date
TreeHugger Robot
f09ee2983d Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: I0d0e6024ff1ad86d009570cff19984da30c2f341
2021-06-03 05:09:14 +00:00
TreeHugger Robot
28128df960 Merge "Fix overlapping problem on running services page" into sc-dev 2021-06-03 04:55:23 +00:00
Yanting Yang
8df821e089 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 am: 4dadee105a am: e98ad64676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: Ifd57cadcb18247d0b2edb776523e46c6c66f79e1
2021-06-03 04:33:11 +00:00
Kunhung Li
84c929c2dd Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 am: be25d20c6a am: fbdaa4fc45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I649361184ddb02309deb74c1039f513b25a847f5
2021-06-03 04:32:39 +00:00
Jason Chiu
8e01b31b63 Merge "Revise homepage colors" into sc-dev am: 132cc2127b am: cbb49b6f3f am: 7bd0f02a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: I5b9c0beb705c6cc9c06726173719beed1315dd89
2021-06-03 04:32:32 +00:00
TreeHugger Robot
8a465df6bf Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: 004f16a8cf am: 079d72ac09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Icbca0eb9dde134450d1704525d080f218b533a60
2021-06-03 04:32:21 +00:00
Yanting Yang
e98ad64676 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 am: 4dadee105a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I75a80121110a4c1bb23a26e64a6cddb6ad1434ae
2021-06-03 04:25:35 +00:00
Yanting Yang
b2f8a8aef3 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: Ic6f6216518da39aaf665a45b29a442b3e277c532
2021-06-03 04:23:57 +00:00
Yanting Yang
4dadee105a Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I9bb58d58df5d9ba6938952b88d4bdec7985a81f9
2021-06-03 04:22:57 +00:00
Kunhung Li
fbdaa4fc45 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 am: be25d20c6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I1362aaeed2005545a7a3a8a608d91dde8968a2cb
2021-06-03 04:17:02 +00:00
Jason Chiu
7bd0f02a73 Merge "Revise homepage colors" into sc-dev am: 132cc2127b am: cbb49b6f3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: I8e9ea4624b8575d1d283b4c674d525c4b5ff444c
2021-06-03 04:16:56 +00:00
TreeHugger Robot
079d72ac09 Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: 004f16a8cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: I8fa5c4cb98bb2a8fe6b78ebdfe655108be48526f
2021-06-03 04:16:48 +00:00
Yanting Yang
09666f9ef4 Merge "Deprecate silky flag for official release" into sc-dev 2021-06-03 04:05:26 +00:00
Kunhung Li
59ffa8c26f Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I5f5a51134cfdc0e25430d85d7f1f9feecbae0f4a
2021-06-03 03:59:29 +00:00
Jason Chiu
940945b67c Merge "Revise homepage colors" into sc-dev am: 132cc2127b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: I9b72ab69494571f6856c49e24a4e0455379ef68a
2021-06-03 03:59:23 +00:00
TreeHugger Robot
0f0329cc8b Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Ie6b9c4b7b0743cf79b013acd14bc9588753077f5
2021-06-03 03:59:18 +00:00
Kunhung Li
be25d20c6a Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I7a5b12ff8812c10ede4e157c15f5963d488ac58a
2021-06-03 03:57:31 +00:00
Jason Chiu
cbb49b6f3f Merge "Revise homepage colors" into sc-dev am: 132cc2127b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: I045d589aa0593e1bd33fe0724f6456fcd00020a5
2021-06-03 03:57:24 +00:00
TreeHugger Robot
004f16a8cf Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: I1fdfcfeeddb0a07b8904f6dc3299bd7c4ce3fd7d
2021-06-03 03:57:10 +00:00
Curtis Belmonte
d9aac76cd6 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 3b1b093d6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: I3f43a045e6271995dd54126b2e577a774dbd7479
2021-06-03 03:41:37 +00:00
Tsung-Mao Fang
ff0c73bfcb Fix overlapping problem on running services page
For Android S, all pages support collpasing tool bar.
We add coordinatorLayout to work with collpasing tool bar
layout. And coordinatorLayout only works with RecyclerView
and NestedScrollView.
Unfortunately, the list was implemented by listView many years ago.

Because it's a very hidden page and the page is not maintained anymore,
we don't consider to migrate to RecyclerView.
Simply enable nested scrolling behavior for listview at this moment.

I also make some small refactorings in this cl.
1) Update the layout padding.
2) Format the xml file.
3) Create a individual cl for this page only.

Test: Don't see the overlapping problem
Fix: 188539741
Change-Id: I21c61e35a06b85ca7c309d1d3182b38b4bb38212
2021-06-03 11:41:14 +08:00
Kunhung Li
a19c7053a2 Merge "Refine wallpaper search keywords" into sc-dev 2021-06-03 03:34:27 +00:00
Jason Chiu
132cc2127b Merge "Revise homepage colors" into sc-dev 2021-06-03 03:31:06 +00:00
TreeHugger Robot
7e0fb6878d Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev 2021-06-03 03:28:42 +00:00
changbetty
de57c12412 Remove Connect to public network for Network Rating Provider
According we remove the Network Rating Provider in ag/14675092, and the
Connect to public network item is tied to the Network Rating Provider.
So need to remove together.

Bug: 187119482
Test: Manaul test
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Ie8a8d5c8d9f2c5db11d6c9e6f84af7864e78814f
2021-06-03 11:22:19 +08:00
Betty Chang
f1a1f241bf Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: b62f95a47a am: bc29f549de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I0115473744fbb8e2a4ee4bb35591497ec700acb7
2021-06-03 03:09:54 +00:00
Bonian Chen
4b0e2894f6 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 4cf2c2b10f am: 462aa78417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I47361cb904dc04309994c172365955a3e37dfefe
2021-06-03 03:09:37 +00:00
Chloris Kuo
52ee33df19 Fix flaky NotificationAssistantPreferenceControllerTest
Fix test failures due to we set the Settings.Secure.NAS_SETTINGS_UPDATED
in NMS instead of in NotificationAssistantPreferenceController. Move
some tests to NotificationManagerServiceTest (in another CL)

Bug: 187999823
Test: make RunSettingsRoboTests
Change-Id: Ibfbaa2c8c15e49a14a7faeda50ec044f62b2fe72
2021-06-02 20:06:55 -07:00
Betty Chang
bc29f549de Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: b62f95a47a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: Ie8c07f35ef6f159bcb45f0f73fd7c537ea7eeb96
2021-06-03 02:52:47 +00:00
Bonian Chen
462aa78417 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 4cf2c2b10f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I4ffe783d966166b248b54b00c81b5f1c7c24df66
2021-06-03 02:52:26 +00:00
Betty Chang
8814da830f Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I10b53a2565ac366435f92fa3aa165b63fb36169e
2021-06-03 02:33:59 +00:00
Bonian Chen
7e5fcd42b2 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I85442cb5380110a91d589d4d5590bb6c70837028
2021-06-03 02:33:52 +00:00
Betty Chang
b62f95a47a Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I6de2cbcb0089500f1ce5fc689356a7a226c8cfe0
2021-06-03 02:33:50 +00:00
Bonian Chen
4cf2c2b10f Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: Iac562f776c021db8f8a59a29504f45fa96778b07
2021-06-03 02:33:32 +00:00
Betty Chang
227f9357ab Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev 2021-06-03 02:33:12 +00:00
Bonian Chen
b71dd1efd2 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev 2021-06-03 02:17:06 +00:00
Janis Danisevskis
552992ac12 Enable the clear credentials buttons when wifi keys are installed.
This patch updates the ResetCredentialsPreferenceController to check the
WIFI keystore namespace if called by the primary user.

Test: Install a WIFI certificate or key and watch the
      "Clear credentials" button become enabled in the credential
      storage dialog of Settings.
Bug: 189601008
Merged-In: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
Change-Id: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
2021-06-02 16:46:18 -07:00
TreeHugger Robot
80f315b677 Merge "Skip translations from sc-mainline-prod" 2021-06-02 22:43:35 +00:00
Kevin Chyn
0c8813a170 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 924105b7d8 am: a25dfa8f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Iaa637e89407a7106249104a8bc6fa38bc573d73c
2021-06-02 20:57:26 +00:00
Kevin Chyn
a25dfa8f3b Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 924105b7d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: I64aaef936eb5b8d833fe8d6df75a4b7cf4d38c36
2021-06-02 20:41:39 +00:00
Kevin Chyn
cf3a9b989f Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ia5fcf24a4dcde1ff4b45dd185ddcbf6a20d29034
2021-06-02 20:22:37 +00:00
Kevin Chyn
924105b7d8 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ia28780a2596557e4e8028f6564734162f69d0086
2021-06-02 20:22:27 +00:00
Julia Reynolds
679445fb43 Updates to conversation page
- Make info preference not selectable
- remove dividers

Test: manual
Fixes: 189414449
Change-Id: I081cea0d51fbc2d1c54ac392cee88a5750985fce
2021-06-02 16:16:17 -04:00
Kevin Chyn
ef963fe079 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev 2021-06-02 20:03:38 +00:00
Abel Tesfaye
faaf8d5af1 Use list+ toggle on devices without face detection
Test: verified intended behavior on crosshatch and no regression on flame, make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceFragmentTest

Bug: 181299673
Change-Id: Ic9f44091e95915bc78bc70b86d7f132ba6e159ed
2021-06-02 19:25:59 +00:00
Trevor Black
5800cd5faf Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 220f6d734a am: ce308a645d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I8a4f9de00136bc7a2c482f34237eabec5a1b3fca
2021-06-02 18:59:28 +00:00
Curtis Belmonte
d5a6692f0f Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 07b4452662 am: d602a9f4e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: I69dc280431e32fb9549a097629f00868b4a1eb1b
2021-06-02 18:59:16 +00:00
Trevor Black
ce308a645d Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 220f6d734a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: I356ae16f623ffa8ac800fd426f99f36ce802db62
2021-06-02 18:35:13 +00:00
Curtis Belmonte
d602a9f4e0 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 07b4452662
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: I0878526a39cc847bfcb82382b4e0c7c56c2197de
2021-06-02 18:34:36 +00:00
Trevor Black
3cf1728e78 Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: Ia2ad7f566610863041a1e86f50e8e3d641e3d46c
2021-06-02 18:20:49 +00:00