PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,788 Commits 1 Branch 0 Tags
08feb531d7b03416ff36a9246a343beeced0615c
Commit Graph

83788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
08feb531d7 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev am: efd1c870f2 am: a7b3e18038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912508

Change-Id: I99ee6b75a3c3257e6c104f1c9b19d847f7e8ac5d
 2021-06-11 10:19:20 +00:00
TreeHugger Robot
a7b3e18038 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev am: efd1c870f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912508

Change-Id: Id3c6949cd3fe8bc5ab90809dfe4e53f0bf3d6917
 2021-06-11 10:04:42 +00:00
TreeHugger Robot
efd1c870f2 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev 2021-06-11 09:50:43 +00:00
TreeHugger Robot
c28e04ec4a [automerger skipped] Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev am: 443a3f03ab am: 2a0ab5de14 -s ours 
am skip reason: Merged-In Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3 with SHA-1 908d4ffadf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934751

Change-Id: I2440dfc18fb6bf0d291aced6e4f5afb126d39987
 2021-06-11 06:59:47 +00:00
TreeHugger Robot
3009b6b247 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev am: 443a3f03ab am: c379bbc0f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934751

Change-Id: I14836be10ffbedfe12dd4d3f35917dfa883c5c52
 2021-06-11 06:59:33 +00:00
TreeHugger Robot
c379bbc0f9 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev am: 443a3f03ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934751

Change-Id: Id31b32bceb720cee3c11c297c4e8bbe84b83b1af
 2021-06-11 06:45:35 +00:00
TreeHugger Robot
2a0ab5de14 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev am: 443a3f03ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934751

Change-Id: I85c6f3d6e5d14534990dcad62a90e6f418df8076
 2021-06-11 06:44:44 +00:00
TreeHugger Robot
443a3f03ab Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev 2021-06-11 06:35:02 +00:00
Betty Chang
4b8da62340 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev am: 8896a0d217 am: 1b686fcaa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928764

Change-Id: I700238b8565288899ce3daf76b730519104a0f80
 2021-06-11 03:53:30 +00:00
Betty Chang
019d728520 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev am: 8896a0d217 am: 344f45deb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928764

Change-Id: I78f051417a03414ecccf80493c4bbcc7c4f21ee7
 2021-06-11 03:53:07 +00:00
Betty Chang
344f45deb6 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev am: 8896a0d217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928764

Change-Id: I22ad82c4e667a6c5a707dfe5986bd91700798fd3
 2021-06-11 03:27:41 +00:00
Betty Chang
1b686fcaa1 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev am: 8896a0d217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928764

Change-Id: I1aa00286ada927341a52dd3956b446f630074efa
 2021-06-11 03:26:55 +00:00
TreeHugger Robot
0219e060cc Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev am: 9faa566ea0 am: f711c010be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912503

Change-Id: Icfb4b60652ac0696c6d7657a60daf38eda96de30
 2021-06-11 03:13:17 +00:00
Betty Chang
8896a0d217 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev 2021-06-11 03:09:38 +00:00
TreeHugger Robot
79166adfb4 Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev am: 9faa566ea0 am: 3b5db22a49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912503

Change-Id: I6797e388d61caebec1f297271ccfbeaca32ddc06
 2021-06-11 03:05:51 +00:00
TreeHugger Robot
f711c010be Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev am: 9faa566ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912503

Change-Id: I21716429a91981e3624159718729f8ea0c2d2ab7
 2021-06-11 02:56:54 +00:00
TreeHugger Robot
3b5db22a49 Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev am: 9faa566ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912503

Change-Id: I95a12f764c2c92c4b351fdcbf6cc88867fa6c205
 2021-06-11 02:56:10 +00:00
TreeHugger Robot
9faa566ea0 Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev 2021-06-11 02:42:52 +00:00
Yanting Yang
472a8f7068 Merge "Left aligned the dropdown list of ManageApplications" into sc-dev am: 391c121920 am: a1487e391b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934750

Change-Id: If74bd547774927e3fd016ccc69af5d8b525b15ef
 2021-06-11 01:57:41 +00:00
Yanting Yang
1e0012af7e Merge "Left aligned the dropdown list of ManageApplications" into sc-dev am: 391c121920 am: fe242896ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934750

Change-Id: I84874fd8cac3910922cc5c7346d7b8e8e5014be8
 2021-06-11 01:57:03 +00:00
TreeHugger Robot
3c86201dd9 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 am: e1c53b2db1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: I629126e793978b5ded3dd7457ef2e00adfeac675
 2021-06-11 01:56:58 +00:00
TreeHugger Robot
371d0e4f99 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 am: c4214332bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: Ieef23a967754043b0cb59b63baff9c98146ac0de
 2021-06-11 01:56:53 +00:00
Yanting Yang
a1487e391b Merge "Left aligned the dropdown list of ManageApplications" into sc-dev am: 391c121920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934750

Change-Id: Ieb69cbef10b905e1e2b9fc28bb356847a0466b3d
 2021-06-11 01:38:47 +00:00
TreeHugger Robot
e1c53b2db1 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: Ice1cdf470ac502dcde20db151ffda7b795f669c6
 2021-06-11 01:38:37 +00:00
Yanting Yang
fe242896ff Merge "Left aligned the dropdown list of ManageApplications" into sc-dev am: 391c121920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934750

Change-Id: I65990a17bf6365ee16c18ad71c2e47e0ac80f7dc
 2021-06-11 01:37:40 +00:00
TreeHugger Robot
c4214332bc Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: I5a98955e74c144c43b71da704a1193d2e8b77498
 2021-06-11 01:37:28 +00:00
Yanting Yang
391c121920 Merge "Left aligned the dropdown list of ManageApplications" into sc-dev 2021-06-11 01:29:28 +00:00
TreeHugger Robot
8dca5ab699 Merge "Fix Learn more link placement is wrong problem" into sc-dev 2021-06-11 01:23:43 +00:00
TreeHugger Robot
28dd81fc08 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev am: ad84b3dd39 am: d34ab1ae58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830090

Change-Id: I894569def643a498cca7ea2058c1930a79faa494
 2021-06-10 19:42:31 +00:00
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
d34ab1ae58 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: I3898c502053b1aa3c533526a85e73c1bc76655bf
 2021-06-10 19:23:06 +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
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