Commit Graph

89603 Commits

Author SHA1 Message Date
TreeHugger Robot
89d6453656 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 3d8e18d905
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I49763abe87f131e57015062f2e48dc7c7ddf2118
2021-06-10 05:53:23 +00:00
TreeHugger Robot
29d0c3c5dc Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 86233cd3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I420a1816d466a88b85e936922fac3e45dfdb0213
2021-06-10 05:52:55 +00:00
TreeHugger Robot
3d8e18d905 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: If31b1742df8cbb89b884bb1e436c1d4829bc4478
2021-06-10 05:42:16 +00:00
TreeHugger Robot
86233cd3ac Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: Iced7c1320df29efb6250132387a8113677642a22
2021-06-10 05:41:00 +00:00
TreeHugger Robot
555fb90e50 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I14c94ab95a3f6148900c9858a759789efef117d5
2021-06-10 05:41:00 +00:00
TreeHugger Robot
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +00:00
Tom Hsu
a7b6f550cc Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 96c1ff8d06 am: 0a5aee68d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I6238803a9f536b1f019b729bc9e224ff36139126
2021-06-10 04:41:42 +00:00
Tom Hsu
6a7d43c946 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: b235d51559 am: 95f6c8814c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: Ib2adcc3a76ad06fd2c5a17c966b80d49f1beffab
2021-06-10 04:41:37 +00:00
Tom Hsu
cb6f323b79 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 6466893bf1 am: db544a358a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: Id3d758330fa7ae088276d2db34fe668d9cd67280
2021-06-10 04:41:30 +00:00
Tom Hsu
803ae5e457 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: 57e089e385 am: 4787f78598
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I7071921fdd79a604d4935dcae1bfcc6b8806b94f
2021-06-10 04:41:09 +00:00
Tom Hsu
0a5aee68d1 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 96c1ff8d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I539ded93087bf650cf186773f8d0edc83d609145
2021-06-10 04:30:30 +00:00
Tom Hsu
95f6c8814c Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: b235d51559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I8dc30621559cefabff8790dad3f2b4c16309c8fe
2021-06-10 04:30:15 +00:00
Tom Hsu
db544a358a Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 6466893bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I8892e6239eda1ae90ebe9bbd2483765439e5ce1c
2021-06-10 04:29:31 +00:00
Tom Hsu
4787f78598 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: 57e089e385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: Icbce9f4ded7a2ed874c5861b9290a90df6ca3fdd
2021-06-10 04:29:22 +00:00
Tom Hsu
b52f7484be Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 979e486314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I65fe0a09a754637ece40a57eacc8b1c05741bf19
2021-06-10 04:29:08 +00:00
Tom Hsu
40987f2679 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: ed18d645e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: Ida355764b564897892be585bc2c88e144cc6aa0d
2021-06-10 04:28:54 +00:00
Tom Hsu
6466893bf1 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I2afd628b39c4bd855345a69cc9da19a854bf31aa
2021-06-10 04:13:04 +00:00
Tom Hsu
57e089e385 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I48f3dceb4d356dfb28fe210fb60404577f390b24
2021-06-10 04:12:53 +00:00
Tom Hsu
96c1ff8d06 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: Ib263e0b74e2b5708c7723f6bc8498e2c9dd712e5
2021-06-10 04:11:52 +00:00
Tom Hsu
979e486314 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I66294bfca255d77f12c1641f0c0e8f94bf57ea9c
2021-06-10 04:11:46 +00:00
Tom Hsu
b235d51559 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I06726069d5e99e2b4870c32d17718df0819cfb47
2021-06-10 04:11:38 +00:00
Tom Hsu
ed18d645e2 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I3ff4eafdf43f7b1249e3399d9438c5c1f35d7725
2021-06-10 04:11:38 +00:00
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
Weng Su
1b11a28709 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" 2021-06-10 03:17:01 +00:00
TreeHugger Robot
c703c22269 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: f6d3b406b4 am: 03e99d367a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

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

Change-Id: I340a963687f4a3332427336a34afc84d54117623
2021-06-10 02:38:40 +00: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
683e147080 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: 30e11c2f89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: Id4dd2d44ff11e6c05e248446ba6164766dbedb15
2021-06-10 02:20:37 +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
30e11c2f89 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: I113854092937696e63036aa5ec6dd96496977807
2021-06-10 02:02:21 +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
Abel Tesfaye
384bed509c Fix battery saver not disabling adaptive sleep switch
Test: locally with flame

Bug: 189900026
Change-Id: I1f0bc5eb1cd021f1eb8526c020f772ce0dd96da0
2021-06-09 23:11:57 +00:00
Curtis Belmonte
f54cc58de4 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 4f9906769e am: a819e28549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

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

Change-Id: I81f6f00c7bb804b9bf20c9e98511b197f98c243c
2021-06-09 22:28:51 +00: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
5d50499e62 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 1bffc18b68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Iffad1424c6fba41f4cdbfbe10153afc1aa8a74ec
2021-06-09 22:11:14 +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
1bffc18b68 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: Ieffec4b19d6c6eb6a445c1a112857edb2f6c96d0
2021-06-09 21:53:08 +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
b44b67802f Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 115302057b am: 6ac51192f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

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

Change-Id: If727ba2e951704e31a777d678385f9382a47e0b7
2021-06-09 21:03:55 +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