Commit Graph

89166 Commits

Author SHA1 Message Date
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
363f73c9ad Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43 am: b771c4fd3e am: 32e212b099
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

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

Change-Id: Ie08673216317b5d7777a430e40628a0e6ae290dc
2021-06-10 16:56:38 +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
4f2465b209 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43 am: 57a55c9be1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: Ib96c88a68ff34951f78aaedd766241f9281d87de
2021-06-10 16:38:13 +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
57a55c9be1 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: I90e602328b3cf1864d03156bf2ca23cad450fe56
2021-06-10 16:22:22 +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
6074fc2b14 Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa am: 581789b298 am: 7632d3447c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

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

Change-Id: I56698bd6bc6206fe436683e26184c1b198e6f8cf
2021-06-10 13:47:37 +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
71c2c269f1 Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa am: 87c542fd3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: If0073160c3238380777f9846b5e517a546f96447
2021-06-10 13:29:24 +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
87c542fd3c 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: I65a596188db30a6b7ed858379a968dc5347b6084
2021-06-10 13:11:09 +00:00
Edgar Wang
aeb2c1d8fa Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev 2021-06-10 12:56:21 +00:00
YUKAI HUNG
f574ff50d8 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 am: bf24efb721 am: d13e958b65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

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

Change-Id: I031f4a9240808080337fb0ae6d223481f10edc09
2021-06-10 12:55:19 +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
0c930affaf Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75 am: a9d833f6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I3ef02087aa44ed37fc877cad8bd76d49ef8d8674
2021-06-10 12:42:13 +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
a9d833f6ea 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: I7a4c87d7105b2304eba92178c85f4a053b6f6ce9
2021-06-10 12:31:11 +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
Weng Su
908d4ffadf Revert "[Provider Model] Replace WiFi panel to Internet panel"
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Merged-In: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
(cherry picked from commit 368852424c)
2021-06-10 12:23:38 +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
Yanting Yang
467c7e81ea Left aligned the dropdown list of ManageApplications
Based on the Android S design, left aligned the dropdown list of
ManageApplications, e.g., All apps, App notifications

Bug: 178774987
Test: visual
Change-Id: I04143798475d20319980396d6bd755193ae2b1f0
2021-06-10 20:18:51 +08:00
Sunny Shao
a6eb37b215 Fix Learn more link placement is wrong problem
- Use the new style of the FooterPreference.

Fixes: 189389674
Test: Robo test
Change-Id: I1529952181cca0eccd18f911eaa265b19dbb97f7
2021-06-10 20:14:56 +08:00
Alex Johnston
7dbd997c7b Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 am: 892e1d5dcc am: b5c25cbb73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

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

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

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

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

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

Change-Id: Iffb930c9c9ba458dce3a57d3c6cc48fd747ec9e7
2021-06-10 10:13:09 +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
fddd57ba67 Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576 am: 24f0fb0a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: I8005b52a34f57d7a1208d5052e45571894b25421
2021-06-10 10:01:07 +00:00
Alex Johnston
a2f754f6e8 Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe am: 50e5f20feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

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

Change-Id: If309115589cc7a416dc81d4d35c7fcf6a5384e2a
2021-06-10 10:00:52 +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