PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,235 Commits 1 Branch 0 Tags
cf81f94e3b9b46d63d20596b09772724cfde3a33
Commit Graph

15975 Commits

Author SHA1 Message Date
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
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
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
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
387ce6027f Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: 1f9329d010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: Iabfb988437d0afeb47280c86692e3e3e6f9c81be
 2021-06-10 09:25:19 +00:00
Kholoud Mohamed
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +00:00
TreeHugger Robot
ba0325cbae Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: 4868bf6f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: Ia7a5fc2ab423078ddfc05eee96637c7bd60a3585
 2021-06-10 07:50:48 +00:00
TreeHugger Robot
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00:00
Mill Chen
491bc21fd4 Remove the duplicated skip lock screen setting 
Fix: 187366696
Test: robotests
Change-Id: I063ef7c1a43e16aee6d141389896cadecfd3738f
 2021-06-10 14:20:44 +08:00
Dmitri Plotnikov
1afe9c0ddc Fix missing time-in-foreground and time-in-background for some apps 
The gist of the issue is that many apps have two UIDs associated
with them: a regular, "real" UID, e.g. 10123, and a shared group GID,
e.g. 50123, which is used for multiuser support.

Prior to this fix, the code in BatteryAppListPreferenceController,
would go over the list of all UidBatteryConsumers and would randomly
encounter either the "real" UID or the shared GID for each app first.
The UidBatteryConsumer for a shared GID does not have all of the
properties of the real UID, so some information, such as
time-in-foreground and time-in-background would be lost with
a high probability.

After this fix, we process "real" UIDs before shared GIDs ensuring
that time-in-* and other properties such as package names are obtained
for the real UID.  When we later encounter a shared GID for the same app,
we just add the consumed power and time-in-* durations to the real UID's
BatteryEntry.

Bug: 188656360
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I4bfea813ac5eb8f866804b2c4a9153eb877fb325
 2021-06-10 05:58:15 +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
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +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
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +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
Julia Reynolds
0718ee6309 Merge "Update method name" into sc-dev am: a2c2889c78 am: 77b60fb6c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I1af02eea2b6f94341b4e61807a89a67af05061f5
 2021-06-09 18:45:26 +00:00
Weng Su
368852424c 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
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
 2021-06-09 17:49:27 +00:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
469caaf49e Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 0dc2fde11e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: Id9975e632d7eb3f0159aa4f1aa80ce92b7db5d78
 2021-06-09 17:19:55 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev 
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
 2021-06-09 16:45:54 +00:00
kholoud mohamed
be0a96bd23 Fix failing tests 
Fixed failing tests in InteractAcrossProfilesDetailsTest and removed
unused code in InteractAcrossProfilesSettingsTest.

Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettingsTest
Fixes: 190186823
Change-Id: I52c498b9eb9c09401548e557770cd6434de49a2c
 2021-06-09 14:11:56 +00:00
Julia Reynolds
b70d3d5c13 Update method name 
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
 2021-06-09 09:53:09 -04:00
YUKAI HUNG
1699b39562 Merge "Resolve locale not update issues in the chart view" into sc-dev am: 4248531508 am: 3cc2a79f44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912493

Change-Id: I069690c8c4ec0cf09a79184d843c935b1337b4b6
 2021-06-09 12:11:26 +00:00
YUKAI HUNG
4248531508 Merge "Resolve locale not update issues in the chart view" into sc-dev 2021-06-09 11:43:41 +00:00
PETER LIANG
352d6c35ed Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb am: 150dd5fa0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310

Change-Id: I92b751501a6c00a046c0d87a5ed1e41eefbf606c
 2021-06-09 11:14:49 +00:00
Weng Su
e3d6d635bd Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev am: 635e57bd4e am: c390be0a48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891919

Change-Id: I71c205542f369b7870dcfce4c7b6960cdb8d7a13
 2021-06-09 10:47:34 +00:00
PETER LIANG
d2c4944cbb Merge changes I99fb2ed2,Iba18bfab into sc-dev 
* changes:
  Support the lottie image file for the banner in Accessibility Settings.
  Fixing the animation of drawable couldn't play automatically for the banner.
 2021-06-09 10:44:10 +00:00
Peter_Liang
3ce3a93e71 Support the lottie image file for the banner in Accessibility Settings. 
Action:
Currently, the ImageView component couldn’t handle the lottie image from raw resource folder,  so temporarily using the LottieAnimationView from settingsLib to support lottie image for the banner of Accessibility settings.

Bug: 186065724
Bug: 179451422
Test: atest AnimatedImagePreferenceTest
Change-Id: I99fb2ed26085c73bc262c58001de8dec3078e1d0
 2021-06-09 10:11:23 +00:00
Weng Su
635e57bd4e Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev 2021-06-09 10:05:51 +00:00
Arc Wang
bdb70b1078 Tweak UI of CardPreference and ContextualCard 
- CardPreference uses settingslib_preference
  layout to fix title/summary alignment issue.

- Remove stroke for CardPreference and ContextualCard.

- Set colorSurface as default card background color.

Bug: 188599776
Test: manual visual
Change-Id: Id0ee40be60de1f7605849490ee43eae4b9420abb
 2021-06-09 17:43:43 +08:00
Arc Wang
7b85f2af24 'Free up space' uses CardPreference 
For material next style.

Bug: 188599776
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CardPreferenceTest
Change-Id: Ibaf4d11ab44017453498676db00cff1e49c83b9d
 2021-06-09 17:35:33 +08:00
Tsung-Mao Fang
0ae249e8c7 Fix broken tests for main clear pages 
After ag/14438399, a lot of related tests failed.
Create two overlay layout files in robolectric and add original theme
style back.

It's not perfect, but it didn't affect the behavior of tests,
Tests still can build the views and do the original tests.

Test: Run robo test
Fix: 187819138
Change-Id: I7af0e9e6c61fc204efeea03ec3ca8437aeb2d256
 2021-06-09 17:08:07 +08:00
ykhung
2a75186e4b Resolve locale not update issues in the chart view 
- read locale from configuration rather than Locale.getDefault
- refine 12-24 format to align the current status bar short style
- resolve locale change not update chart percentage label
- extend timestamp label in the chart graph from 4 to 5 labels

Bug: 190150515
Bug: 190422902
Bug: 190226837
Test: make SettingsRoboTests
Change-Id: I5347964900123a6d112dbc37c2af87eb7d73f1d2
 2021-06-09 16:11:15 +08:00
Menghan Li
313ce94b88 Merge "Add AccessibilityShortcutPreferenceFragment to share non-accesibility tools to add shortcut" into sc-dev am: c4609d14f4 am: 57f5ad34be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860442

Change-Id: I2c3c1ce430174be7261f1b121d63589f5f1b5e87
 2021-06-09 06:04:14 +00:00
Menghan Li
87fd9a6816 Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev am: 0a9d2385f0 am: f9934b37d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860441

Change-Id: I66b8de764f6b69a40264a122100e81c8adc169d9
 2021-06-09 06:04:09 +00:00
Menghan Li
c4609d14f4 Merge "Add AccessibilityShortcutPreferenceFragment to share non-accesibility tools to add shortcut" into sc-dev 2021-06-09 05:42:08 +00:00
Menghan Li
0a9d2385f0 Merge "Move DialogEumn into AccessibilityDialogUtils" into sc-dev 2021-06-09 05:41:00 +00:00
TreeHugger Robot
c6050c893e Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712 am: 18fb8ec7aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446

Change-Id: I2dade4d55a82a92df15e726af992bb5931f94e84
 2021-06-09 04:28:21 +00:00
TreeHugger Robot
75d3635712 Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev 2021-06-09 03:30:10 +00:00
Weng Su
8c29ff0a27 [Provider Model] Fix the panel non responsive issue 
Bug: 187340277
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie27a5049b2cab05b7c7936395d0db85c3c594d96
 2021-06-09 00:35:53 +08:00
menghanli
e771cbb1aa Add AccessibilityShortcutPreferenceFragment to share non-accesibility tools to add shortcut 
Bug: 190022774
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityShortcutPreferenceFragmentTest
Change-Id: I1cae8fbed059ba7c309126e2dff46adfb48cffd8
 2021-06-08 22:58:05 +08:00
YUKAI HUNG
b7f3344b58 Merge "Remove BatteryTipPolicyTest first to avoid blocking presubmit" into sc-dev am: f7b90c3a7f am: 85d03642f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880237

Change-Id: I6029a1829a27d1da0f43c2eb3af74802ae385c6c
 2021-06-08 14:10:41 +00:00
ykhung
ae1797ec46 Remove BatteryTipPolicyTest first to avoid blocking presubmit 
Bug: 190150515
Test: make SettingsGoogleRoboTests
Change-Id: If97e0853d7904919f54f4c4b970380f6fb40efc6
 2021-06-08 19:04:55 +08:00
Giuliano Procida
7362a2b843 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev am: ef0e09f7a3 am: d26cb5c9a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880698

Change-Id: Id629bec6759ee8611f842d7ee7c840fe077a298e
 2021-06-08 10:04:28 +00:00
Giuliano Procida
ef0e09f7a3 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev 2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings" 
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
 2021-06-08 09:47:51 +00:00
Edgar Wang
79f237ef42 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev am: 4aad4a88a7 am: 5863ab2406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422705

Change-Id: I1326a91377255abf12cc4a40e2268c8609ca7c90
 2021-06-08 08:22:13 +00:00
Edgar Wang
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00