Commit Graph

83752 Commits

Author SHA1 Message Date
TreeHugger Robot
e56b1ad5b9 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev am: ad84b3dd39 am: 2c40af09e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830090

Change-Id: I3493ee4824bd1c0a7d6fadce056a7f85d1536774
2021-06-10 19:41:00 +00:00
TreeHugger Robot
2c40af09e4 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev am: ad84b3dd39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830090

Change-Id: I7c276b7313261a639746c13d2d678bdd713eeb7e
2021-06-10 19:26:42 +00:00
TreeHugger Robot
ad84b3dd39 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev 2021-06-10 18:35:43 +00:00
Abel Tesfaye
5131c691b5 Check in auto rotate settings summary for rotation resolver service
Fixes issue where summary text would not properly describe the state of
camera based auto rotation when permission is missing or when another state is blocking the feature

Bug: 190095500
Test: locally with flame & make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceControllerTest
Change-Id: I7609ca87658e08831f3bc37c839f00f63946ddec
2021-06-10 17:31:39 +00:00
Dmitri Plotnikov
32e212b099 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43 am: b771c4fd3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: Ia1e6854133bca97d47e2c99ae7a66516e0add494
2021-06-10 16:43:55 +00:00
Dmitri Plotnikov
5c4868ea49 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43 am: c81b26587c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: Ifea273db1fef21f668dc95a0711ef7473cb2e4fc
2021-06-10 16:39:35 +00:00
Dmitri Plotnikov
b771c4fd3e Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: I6adcaf080d740e208ba339c150218bea9a88b15c
2021-06-10 16:23:29 +00:00
Dmitri Plotnikov
c81b26587c Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: I66e7320edfddd234add418d8feb57ebdb567d29d
2021-06-10 16:22:10 +00:00
Dmitri Plotnikov
6c09370c43 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev 2021-06-10 16:10:42 +00:00
Edgar Wang
7632d3447c Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa am: 581789b298
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: I96a073436a2fe938fd61b9319ad1907c10a4bef1
2021-06-10 13:30:27 +00:00
Edgar Wang
d664929784 Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa am: 4bad84cf9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: Iab59cdf094487df11800cf5081c666009f2a7879
2021-06-10 13:30:03 +00:00
Edgar Wang
4bad84cf9b Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: Ibfba04d2a75f814ed9bd5f8dd25562b1e615d408
2021-06-10 13:12:51 +00:00
Edgar Wang
581789b298 Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: I87ab04ff14db933b54a23348a6ce661d5d1d3d80
2021-06-10 13:11:28 +00:00
Edgar Wang
aeb2c1d8fa Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev 2021-06-10 12:56:21 +00:00
YUKAI HUNG
d13e958b65 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 am: bf24efb721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I95cf7613500d6ccc481c243e15fe738d868d4032
2021-06-10 12:43:20 +00:00
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
bf24efb721 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: I22b5e6c7e2a0eaaa31fdda2adf60a2aa1ad60dbf
2021-06-10 12:30:59 +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