PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,991 Commits 1 Branch 0 Tags
5af65de4c41cdabc4968fcf02eb3e8941588e6cc
Commit Graph

83991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hsu
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +00:00
Tom Hsu
8974f99365 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev 2021-06-10 03:58:00 +00:00
Tsung-Mao Fang
cbf5ccab0e Fix shifting problem in location services page 
Controller generates the injection location settings
in updateState() which happens in onResume.
That's the primary reason why we observed the shifting issue.

In a good practice, we generate preference in displayPreference(),
and then update the setting state in updateState().

In this cl, we create a base controller class to encapsulate
most implementation, and developer need to inject location
services in child class.

Test: Add work profile, and see correct services list.
Bug: 183169265
Change-Id: I5735ba974da87ad83b56791abd8a8637c2317571
 2021-06-10 11:26:23 +08:00
TreeHugger Robot
03e99d367a Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: f6d3b406b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I0d9fd139271b81328d3e57f9fcdd2e9e33ebe5fb
 2021-06-10 02:21:43 +00:00
TreeHugger Robot
0f31f9bd84 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: 6eb29afaff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I0ab191970421bf313ef8588673859eb43b5cfeb2
 2021-06-10 02:21:11 +00:00
TreeHugger Robot
6eb29afaff Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I4c4ee05dadd5f705549fb602977127f17814e277
 2021-06-10 02:04:17 +00:00
TreeHugger Robot
f6d3b406b4 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I29eb0e6131cb2d861b29f1f48ef749f727ef26b6
 2021-06-10 02:02:16 +00:00
TreeHugger Robot
0a111093bd Merge "Adjust size/position of face education illustrations" into sc-dev 2021-06-10 01:38:21 +00:00
Curtis Belmonte
2f2acef17a Adjust size/position of face education illustrations 
Increase the size of the Lottie animation and adjust the margins of both
illustrations shown on the Face Unlock enrollment education screen.

Test: Start face enroll, press accessibility button on education screen

Fixes: 189725079
Change-Id: I40fc174c2ae574ed1a2919e8fab8a62ce90c8d0e
 2021-06-09 17:31:56 -07:00
Curtis Belmonte
a819e28549 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 4f9906769e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I27e2f8eac3c068ce2663afdb23c3a79915ddaba5
 2021-06-09 22:12:21 +00:00
Curtis Belmonte
17dd91093e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 5c440f729b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I807713a3dd188658093408cc64620079cfd2a6b1
 2021-06-09 22:11:29 +00:00
Curtis Belmonte
5c440f729b Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Ice2a7a3b1a9252c1e1ffda770fab41d4bc7e6785
 2021-06-09 21:54:19 +00:00
Curtis Belmonte
4f9906769e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I487a6d0dd1bdfb331c765b2e75b8d784bbc22e79
 2021-06-09 21:52:51 +00:00
Curtis Belmonte
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +00:00
Joshua Mccloskey
6ac51192f1 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 115302057b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I5f26fb6fac4a8e8445cc8ac6bd3ba1ff521fc51c
 2021-06-09 20:52:35 +00:00
Joshua Mccloskey
3bf8a7a7fc Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 62f05dc807 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I0623606273aaaabbe855571256d86586e655047e
 2021-06-09 20:52:04 +00:00
Joshua Mccloskey
62f05dc807 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I267821d5a9088792f57d6731b646ac94f1bcc8bc
 2021-06-09 20:33:28 +00:00
Joshua Mccloskey
115302057b Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I59c751047daa2028b1c6baaf2a2f9260e3d58e3d
 2021-06-09 20:31:58 +00:00
Joshua Mccloskey
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
0b914c6c56 Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 9f76510d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: Ib92c4fc2e0efce0fd61f778f2dea7871c4816ee8
 2021-06-09 19:52:42 +00:00
TreeHugger Robot
fe0f7f172f Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 1652fde41c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: Ic0aa3ec45753f5bf7b51091bb838b877eced80e8
 2021-06-09 19:51:01 +00:00
TreeHugger Robot
9f76510d0f Merge "Apply android accent color" into sc-dev am: 40f65961a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I1a08bc2ecf340a8a5dfe906bf19a7b35a6308587
 2021-06-09 19:36:14 +00:00
TreeHugger Robot
1652fde41c Merge "Apply android accent color" into sc-dev am: 40f65961a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I943fe7c1560ad0250edb2fdc79d0cc02503f2de7
 2021-06-09 19:30:36 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
b64c178b17 Merge "Update method name" into sc-dev am: a2c2889c78 am: 6f89dddcc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I0353295c2fe5727d4c5cf60704062007c260c6e4
 2021-06-09 18:54:22 +00:00
Julia Reynolds
cf63f6ec08 Merge "Update method name" into sc-dev am: a2c2889c78 am: c0e361ba79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iea3700e06f6b2ad1b5e7c64eb7b3784d815a0532
 2021-06-09 18:49:26 +00:00
Julia Reynolds
6f89dddcc0 Merge "Update method name" into sc-dev am: a2c2889c78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I4e469fcfc86a3117e094ded36279675341ccd34f
 2021-06-09 18:04:04 +00:00
Julia Reynolds
c0e361ba79 Merge "Update method name" into sc-dev am: a2c2889c78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iaedb06a7d862f708af1ba1139f17a648d74ace4e
 2021-06-09 18:02:33 +00:00
Curtis Belmonte
f097ad4100 Remove intro text from Face Unlock Settings screen 
Removes the intro text from the top of the Face Unlock Settings screen,
since it is now redundant with the help text shown in the footer of this
screen.

Test: Open Face Unlock Settings, ensure intro text is gone

Fixes: 190622232
Change-Id: Ie7880a2e5b1405bf1298e3b9160b7d534fabd1c2
 2021-06-09 10:59:06 -07:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
d564e9f7b3 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 38bd71ed07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I2d80aa4bd09942d6eb82243ded47b73501e341d4
 2021-06-09 17:22:35 +00:00
TreeHugger Robot
a0ab6ee754 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 5ccaa61a2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I500c4b58fe25d62953f21f60323c8f4a6ad39c19
 2021-06-09 17:21:43 +00:00
TreeHugger Robot
38bd71ed07 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I2bb61c9034d31d650ba1e815c6a0f3d0ddbaac47
 2021-06-09 17:05:01 +00:00
TreeHugger Robot
5ccaa61a2f Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I181cc7e6385a87f40d8632db84e98f4e9b279206
 2021-06-09 17:04:12 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev 
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
 2021-06-09 16:45:54 +00:00
Sunny Shao
4c5f66175a Fix button is not fully rounded corner issue am: d769667e09 am: 20efc0ce3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I36556c0f377fffd5ff630e9efb50fdc172b7323d
 2021-06-09 16:04:10 +00:00
Sunny Shao
c484b7e7f0 Fix button is not fully rounded corner issue am: d769667e09 am: 997641d20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I4a3d3832f612860642725abfad3feba9b4e73d73
 2021-06-09 16:02:10 +00:00
Sunny Shao
997641d20c Fix button is not fully rounded corner issue am: d769667e09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: Iafa9ad7cc80c67b58ad84a717d33caec58552e90
 2021-06-09 15:42:55 +00:00
Sunny Shao
20efc0ce3e Fix button is not fully rounded corner issue am: d769667e09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5bb8d0590937d8544cc0eaf50705314d4bfdad07
 2021-06-09 15:41:23 +00:00
kholoud mohamed
be0a96bd23 Fix failing tests 
Fixed failing tests in InteractAcrossProfilesDetailsTest and removed
unused code in InteractAcrossProfilesSettingsTest.

Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettingsTest
Fixes: 190186823
Change-Id: I52c498b9eb9c09401548e557770cd6434de49a2c
 2021-06-09 14:11:56 +00:00
Julia Reynolds
b70d3d5c13 Update method name 
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
 2021-06-09 09:53:09 -04:00
Yi-Ling Chuang
58a2a32b4e Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 am: e031b6f551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: If3a6ff70881bb2a7d06c663663a71a86c6a90e14
 2021-06-09 13:43:00 +00:00
Sunny Shao
d769667e09 Fix button is not fully rounded corner issue 
Fixes: 189903078
Test: manual test
Change-Id: I498e2a9050255801c8c2613c4a933d8a713a0d55
 2021-06-09 21:42:06 +08:00
Yi-Ling Chuang
d7f96b9571 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 am: aba4103920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I3932b966c5e0b022ac696c02b9e4d43cdbe25272
 2021-06-09 13:41:35 +00:00
Yi-Ling Chuang
e031b6f551 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I7ee7cebf5286051bb20cf3de07dabcf9a1fe0f68
 2021-06-09 13:22:09 +00:00
Yi-Ling Chuang
aba4103920 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I13353feb811de25053023358d955db1eff957bf5
 2021-06-09 13:19:12 +00:00
Yi-Ling Chuang
562ad29721 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev 2021-06-09 13:06:59 +00:00
Zoey Chen
765af03e34 Merge "[Settings] Fix test failure of WFC group" into sc-dev am: 38b22563f8 am: 5047a5d041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912500

Change-Id: Id165c693a27b946e521d52813ddb06b8a634bfb6
 2021-06-09 12:13:03 +00:00
YUKAI HUNG
551786c58f Merge "Resolve locale not update issues in the chart view" into sc-dev am: 4248531508 am: bf203b18e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912493

Change-Id: I9c0e257bac048c8b5bbec5640d2e58f4dfb3f9f1
 2021-06-09 12:12:49 +00:00
Zoey Chen
69db832d4e Merge "[Settings] Fix test failure of WFC group" into sc-dev am: 38b22563f8 am: ee2b43c9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912500

Change-Id: Ifa3dfce891d11fbdadad4e5947209a71f3f4a87e
 2021-06-09 12:12:03 +00:00