PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,734 Commits 1 Branch 0 Tags
973398d1076bb25fff464e81d6ad0d1949f5fdc2
Commit Graph

83734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YUKAI HUNG
973398d107 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 am: d971cb22c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: Idd1836eeea7c6b36bbae0972724104be72198afa
 2021-06-10 12:42:31 +00:00
YUKAI HUNG
d971cb22c6 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I687efe774f5bbd5334623bcc486ec864f571045a
 2021-06-10 12:32:18 +00:00
YUKAI HUNG
394211dd75 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev 2021-06-10 12:18:53 +00:00
Alex Johnston
b5c25cbb73 Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 am: 892e1d5dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: I80fdfe3d4fe7b94beb9e2fedf8782e477b83e24d
 2021-06-10 10:02:23 +00:00
Alex Johnston
436f5027b9 Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe am: 6a1fd88860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

Change-Id: I3da0b72e94d978535279e03aacdcbcfce7ca9941
 2021-06-10 10:02:18 +00:00
Alex Johnston
ff515df597 Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14 am: 12a4f45c57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: I915bd379bfff031cae96ccd63abee06f4c02e740
 2021-06-10 10:02:13 +00:00
Alex Johnston
0c83f36d6a Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 am: 2adb28dca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: I5f502245cd37ba5a649b09af3b790eb50b9d5d17
 2021-06-10 10:01:30 +00:00
Alex Johnston
0777ea1095 Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe am: 342d0bb40c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

Change-Id: I43f05d9dbaaef87f65b6d8597d8b2311dd45d430
 2021-06-10 10:01:26 +00:00
Alex Johnston
ee426f4c65 Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14 am: 58bc189dbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: I07c8fd53989225e9bb94e8452db2d5f40139fa09
 2021-06-10 10:01:20 +00:00
Alex Johnston
2adb28dca2 Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: I28a4a269a20f90c05d3b27ff949056c418954198
 2021-06-10 09:51:51 +00:00
Alex Johnston
342d0bb40c Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

Change-Id: I7f42f564853d7d1113aafb2e1b25866894b038ff
 2021-06-10 09:51:45 +00:00
Alex Johnston
58bc189dbf Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: I59b98577ce2d981141335ae65dceebd5c691e538
 2021-06-10 09:51:38 +00:00
Alex Johnston
892e1d5dcc Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: Ia9915695d981d9f7249ce86948832700590112e1
 2021-06-10 09:50:30 +00:00
Alex Johnston
6a1fd88860 Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

Change-Id: Ie8ab9ae28855e7b1c5498a2e02d28c4925325044
 2021-06-10 09:50:25 +00:00
Alex Johnston
12a4f45c57 Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: Ieda17041b5818f632c0586800d4cc98b3ff15974
 2021-06-10 09:50:17 +00:00
Alex Johnston
cf5bb13576 Merge "RequestManageCredentials Material Next Spec" into sc-dev 2021-06-10 09:38:35 +00:00
Alex Johnston
17101d6ebe Merge "RequestManageCredentials landscape mode" into sc-dev 2021-06-10 09:38:29 +00:00
Alex Johnston
e2f5b87c14 Merge "Credential management app UI tweaks" into sc-dev 2021-06-10 09:38:15 +00:00
ykhung
671405b6d3 Ignore the flaky test in the ConvertUtils first to investigate 
Bug: 190689531
Test: make SettingsRoboTests
Change-Id: Icf4fdd98d087f3e693a33d63030bec880648c356
 2021-06-10 17:33:08 +08:00
Kholoud Mohamed
27b3a2e49f Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: 8cb66ec54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I63ee5dd9bd18dea1b6aa80d099bd5957e811feea
 2021-06-10 09:30:57 +00:00
Kholoud Mohamed
e510d72376 Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: a36537b7a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I2af50a9e87d7cd2b642b790ddb19dc64f6296ecb
 2021-06-10 09:26:44 +00:00
Kholoud Mohamed
8cb66ec54a Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I0b741d1d91b78d722e275516ef11c4b69d88ab91
 2021-06-10 09:13:23 +00:00
Kholoud Mohamed
a36537b7a5 Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I8a1378d044ef9f5fe8927113456a7168975dc06c
 2021-06-10 09:12:03 +00:00
Kholoud Mohamed
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +00:00
TreeHugger Robot
eaad00b30e Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 am: 8c4a1e129a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: I7cb870e05f5c5c3eb5ed4dadd289fe8dcdd7164d
 2021-06-10 08:13:24 +00:00
TreeHugger Robot
f429b0d997 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 am: 7dd56aaa7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: Ie1215b366eaabfd35c3d1080b977b93897371a68
 2021-06-10 08:12:39 +00:00
TreeHugger Robot
7dd56aaa7b Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: Ia28bb9746cb2b77a856d9ee90ab2132dcf57d07f
 2021-06-10 08:02:21 +00:00
TreeHugger Robot
8c4a1e129a Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: I82055f3fba3ba7101a3c51a1f5feba4db153bb1b
 2021-06-10 08:00:59 +00:00
TreeHugger Robot
a3502057c6 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: bf101173ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I5b5134520cd5cd8dcf4a0c5b6a78861843c1666f
 2021-06-10 07:56:27 +00:00
TreeHugger Robot
53055d6ac1 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: f33d9d4b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I4170054d7d6c09ab189bfdea8d354bbf75344d53
 2021-06-10 07:51:56 +00:00
TreeHugger Robot
970e76fd59 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev 2021-06-10 07:47:29 +00:00
TreeHugger Robot
bf101173ad Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I455e74f27cf2b67cb7227c9e7a44262a96b395f6
 2021-06-10 07:39:13 +00:00
TreeHugger Robot
f33d9d4b39 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I5a3b240ac57a0e507acfd8a57955bcca87be63fb
 2021-06-10 07:37:47 +00:00
TreeHugger Robot
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00:00
TreeHugger Robot
486340906a Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 555fb90e50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: Ib94283b0344caa97e9f2f79d3da3912b1a464312
 2021-06-10 05:54:14 +00:00
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
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
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
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
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
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
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