Commit Graph

37696 Commits

Author SHA1 Message Date
Menghan Li
af6acd38a5 Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121 am: 2f9ec68cbf am: caac0d6c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240

Change-Id: I067415587bc8bf01932e6efd8145b03ba185cca5
2021-05-31 03:07:40 +00:00
TreeHugger Robot
132acb43aa Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c am: 3127f05be9 am: c3cc642534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: Ida67a4838be73176d792e9edae1f10610c29a1aa
2021-05-31 03:06:52 +00:00
TreeHugger Robot
ae12fa6ae5 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f am: 4d1c81ac07 am: 79d458d3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: Ida36c97d256803b6e2b7cdf03872e766c1ed4850
2021-05-31 03:05:24 +00:00
Menghan Li
2f9ec68cbf Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240

Change-Id: I214a693021cdd4f090048e3905d8a8c56b931233
2021-05-31 02:48:39 +00:00
Menghan Li
302fb36121 Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev 2021-05-31 02:44:12 +00:00
TreeHugger Robot
3127f05be9 Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: I5ca9dd413db7d8254b80e33a99fdefba9e1f264d
2021-05-31 02:42:02 +00:00
TreeHugger Robot
88346ce71c Merge "Update Policy transparency dialog layout" into sc-dev 2021-05-31 02:29:53 +00:00
TreeHugger Robot
4d1c81ac07 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I44e3d8aced8c47621931bd7185632cc4527d29b2
2021-05-31 02:25:56 +00:00
TreeHugger Robot
bc587c4d1f Merge "Fix bluetooth pairing notification could not be removed" into sc-dev 2021-05-31 02:07:17 +00:00
TreeHugger Robot
a423afc8fa Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06 am: 7425f30a21 am: 8b201e4d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238

Change-Id: I1b1cc091befa78e470298940695bf466919cee73
2021-05-28 04:08:57 +00:00
TreeHugger Robot
cbd7b46de8 Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0 am: faf84a3cd2 am: 033421f680
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201

Change-Id: I2b34b5ad4f5f092d853121f73826504d239a620c
2021-05-28 04:08:51 +00:00
TreeHugger Robot
af258e57e1 Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014 am: 28544e66b2 am: 704b9458c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: I5965168f0d9554c69fe52b19f088a89364af11cc
2021-05-28 04:08:45 +00:00
TreeHugger Robot
1d21a839c8 Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 1a79c0a26d am: 68fa890bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: Ied3aa7348f979dbdb8cec00e42dca673d9de56ae
2021-05-28 04:08:21 +00:00
TreeHugger Robot
7425f30a21 Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238

Change-Id: Ifa521f727c712ba22a9791028d3a4eb4a4f7a68b
2021-05-28 03:44:05 +00:00
TreeHugger Robot
7ffd89ed06 Merge "Hide "Add link" item when have no addable items" into sc-dev 2021-05-28 03:21:42 +00:00
Beth Thibodeau
910d1f7aa8 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 am: baf515ee95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I300769f058b71090dee2d9581dab72c1e1332031
2021-05-28 03:06:49 +00:00
Betty Chang
4182307ec9 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 8fdf4774b4 am: 58e10e06c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: If3f90c94cb71b306d82bf11c609fbf1cf3be31d5
2021-05-28 03:06:35 +00:00
Kevin Chyn
5ee511cdf2 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8 am: a0adbe1918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I9812b61f0a82038d53d8d63837c9305ac6bbec12
2021-05-28 03:06:28 +00:00
TreeHugger Robot
faf84a3cd2 Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201

Change-Id: Ice99d90d0aa2969d1d89f92682ae4c21d8d54685
2021-05-28 03:05:50 +00:00
TreeHugger Robot
28544e66b2 Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: Ie0629acef005da53d4a76b128bf58378989bb070
2021-05-28 03:05:45 +00:00
TreeHugger Robot
1a79c0a26d Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: Ia4d3be59a713405159191f391aef3f855b593083
2021-05-28 03:05:25 +00:00
Beth Thibodeau
b7749fd405 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I93ad28321bdc880f9fda6c6299cb1b5b60d81cfa
2021-05-28 02:29:54 +00:00
Betty Chang
8fdf4774b4 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: Iad8e167b8f9f38b906ceb14cb9a713e8e200c354
2021-05-28 02:29:30 +00:00
Kevin Chyn
e6eb1020f8 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I76b7fff784faa5945717c1ec3d016f7ab57d5ece
2021-05-28 02:29:24 +00:00
TreeHugger Robot
aab74b24c0 Merge "Fix NPE at Storage Settings configuration change" into sc-dev 2021-05-28 02:01:54 +00:00
TreeHugger Robot
90c29cf014 Merge "Shows trash category in Storage Settings" into sc-dev 2021-05-27 23:33:57 +00:00
menghanli
5ea1f03287 Fix dialog when turn on Magnification shortcut doesn't apply GS family
Bug: 188754508
Bug: 186065669
Test: Manual testing
Change-Id: I0ce3cbf4abb6e9e6f1f25577bddb16e316c8c370
2021-05-27 20:41:52 +00:00
TreeHugger Robot
2718cea083 Merge "Fix scrolling issue after MLS switches" into sc-dev 2021-05-27 19:57:34 +00:00
Yu-Han Yang
fdff6af031 Fix scrolling issue after MLS switches
Bug: 187546020
Test: on device
Change-Id: Ie1c573396cbc8b3256db5e350c622e566a44495c
2021-05-27 11:31:09 -07:00
Beth Thibodeau
8e67634830 Merge "Add recommendation setting and remove app settings" into sc-dev 2021-05-27 16:19:17 +00:00
Arc Wang
8fde6ca821 Shows trash category in Storage Settings
If there is APP which supports VIEW_TRASH intent,
use it to show trash files. Otherwise popup a dialog
to guide users to empty trash files.

Bug: 189109564
Test: manual visual
      Observe size information are the same as files in Files APP.
      Observe if empty trash button empty trash files.
      Observe if Trash category update summary and order after emptying
      trash files.
Change-Id: Ia3c46dcb1b4fadcdfb865f7dd315c27f8f98cb2c
2021-05-27 17:50:11 +08:00
Betty Chang
b857491c48 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev 2021-05-27 09:04:42 +00:00
Sunny Shao
8610fff399 Hide "Add link" item when have no addable items
Fixes: 188115562
Test: manual test
Change-Id: I9cfc634a50cc75d907f4563e1a9d9c1fa34d88fb
2021-05-27 16:59:04 +08:00
Kevin Chyn
dc00faece6 Merge "Use lottie animation for fingerprint edu" into sc-dev 2021-05-27 08:31:55 +00:00
Edgar Wang
83507b5f33 Update Policy transparency dialog layout
- Update icon
- Fix color didn't apply dark theme.

Bug: 188756125
Bug: 189167991
Test: manual
Change-Id: Ie975c8999efe352fc9485d936a065d33e5ca76b1
2021-05-27 13:03:44 +08:00
Curtis Belmonte
c3a2fe3ab9 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015 am: 4bbe7beced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I0a35f5c08f89a73b440cfb7abc3f3b2adde39c76
2021-05-27 03:03:32 +00:00
Arc Wang
07f2086ecd Fix NPE at Storage Settings configuration change
At configuration change, both StorageCategoryFragment and
ProfileSelectStorageFragment are re-created and there is
a different callback sequence than normal case.

This change save/restore mSelectedStorageEntry in instance
state bundle to fix the NPE.

Bug: 189108700
Test: manual
      Install work profile and rotate Storage Settings.
Change-Id: I39d7ef7ced22188ee66216d57518198d63671e0e
2021-05-27 10:27:24 +08:00
Curtis Belmonte
25b4e38015 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: Ia9bec4a1e4d0fe47aa4232bb87c360f67f8ad560
2021-05-27 02:15:03 +00:00
Hugh Chen
b2af6ce1bd Fix bluetooth pairing notification could not be removed
Remove the notification when deivce is not bonding.

Bug: 189284833
Test: manually test
Change-Id: Iaa7f04175dac2016777b0de287122108b74b34d8
2021-05-27 10:08:24 +08:00
Curtis Belmonte
2c8745b58d Merge "Fix crash due to traffic light face Lottie animation" into sc-dev 2021-05-27 01:55:58 +00:00
Curtis Belmonte
adf0cabe0a Fix crash due to traffic light face Lottie animation
Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
2021-05-26 16:11:56 -07:00
Kevin Chyn
1bad80b36b Use lottie animation for fingerprint edu
The landscape layout can be removed now, since for UDFPS,
we do not use this page for the "find sensor" functionality anymore.
Instead, we show the edu animation.

Bug: 187460696
Test: manual

Change-Id: Ic2e15ecf73c42b8a0cea4ea8996b1b7dd2f3b4f2
2021-05-26 14:49:51 -07:00
TreeHugger Robot
00306d9858 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: fcbf881fc2 am: 434920c3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: I2394ebd50b60134094df4a6d7dc482dbf6f7e247
2021-05-26 19:30:27 +00:00
TreeHugger Robot
434920c3e6 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: fcbf881fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ia70c7d7580c4fb960d9146a650d2e87717bed2fe
2021-05-26 19:15:09 +00:00
TreeHugger Robot
b834409f7c Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ic555a2748a97b1ffe3f99101416d31e1de264c5a
2021-05-26 18:49:38 +00:00
TreeHugger Robot
1e747a593f Merge "Rounded ripple notification history snoozed list" into sc-dev 2021-05-26 18:33:23 +00:00
Peter Wang
5a8b9cbb4a Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851 am: 0317a93e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I7d1b3bdb4da0f3838e365379f48bfa5a2c5d9318
2021-05-26 18:21:40 +00:00
Abel Tesfaye
a09530fd74 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf am: 9612461482
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: If7a094e22e7762e851fabef9740f9217a6eaf6b9
2021-05-26 18:21:03 +00:00
Peter Wang
0317a93e50 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: Iaf038fe882d97014836467b30a0688b77ae9c834
2021-05-26 18:05:35 +00:00
Abel Tesfaye
9612461482 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: If68cfe699eaa550b79dbdb3e2c6feeefe5d1e0a0
2021-05-26 18:04:54 +00:00