Commit Graph

592 Commits

Author SHA1 Message Date
TreeHugger Robot
f8bb8aced9 Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev 2021-09-07 07:27:05 +00:00
Jason Chiu
7426ab7b9f Define menu keys for highlighting the menu entry on 2-pane UI
- Define an attribute for highlightable menu keys
- List the keys for Settings menu entries
- Support parsing the attribute

Bug: 199017944
Test: robotest
Change-Id: I5759bff591c79d498fffb8b2c2b57f2cb66c4421
2021-09-07 06:32:19 +00:00
Weng Su
29f4a35dea [RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
2021-08-26 04:24:39 +00:00
Ahan Wu
a551ea537c Use new api to create InteractionJankMonitor.Configuration.Builder
The api to create InteractionJankMonitor.Configuration.Builder has
changed, adopt the new api.

Bug: 170708749
Test: build pass
Change-Id: I627370fed43630750eab2ec9752338fb03753463
2021-07-29 19:22:54 -08:00
menghanli
e18c419f94 Fix toggle display and preferen style old style and barely seen in “Vision Settings”
Root cause: Apply ThemeHelper.trySetDynamicColor would overlay the
settings style.
Solution: Create SudDynamicColorThemeSettings.SetupWizard to support
dynamicColor and settings style.

Bug: 192410829
Test: manual test
Change-Id: Ic196dfe417e7f804c68ed4ea7bc05b4716999bcf
2021-07-06 15:32:34 +08:00
Mill Chen
aede51f0e7 Update dynamic height adjusting
The current dynamic height adjusting workaround might cause that a
flicker problem happens in the collapsing toolbar and it might cause
that the collapsing toolbar has different background colors in some
setting pages. The new Material library has already supported the
dynamic height adjusting for multi-line titles, so we will use the new
mechanism instead.

Fix: 190997145
Test: go through Settings pages and check if there's a flicker problem
Change-Id: I9f27b1a887c8866ff7f5ed496de0c6e551a97b17
2021-07-02 21:56:34 +08:00
Mill Chen
968151aa18 Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev 2021-06-28 17:34:01 +00:00
Yanting Yang
ca0415d475 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev 2021-06-28 12:54:44 +00:00
Mill Chen
139fa375cd Add line spacing multiplier for CollapsingToolbarLayout
Since there is a problem with a small line spacing between multiline
title of collapsing toolbar in a few locales, that caused the title is
overlapping with each other. Enlarging the line spacing by using
lineSpacingMultiplier to fix it.

Fix: 183223866
Test: visual verified
1) Change to MY locale
2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms &
other interruptions
3) Observe the title and check if it is overlapping with each other

Change-Id: I87f0af5151a6367bc623ac07b15e04c39b51c6ca
2021-06-28 18:39:20 +08:00
Yanting Yang
aa636d5f9a Clear legacy code about AppAndNotificationDashboard
Bug: 183670633
Test: make -j
Change-Id: Ib763becd8febe86e54b3123c69efae9bd8bf86b4
2021-06-25 10:14:06 +00:00
Mill Chen
fb2bfac434 Fix a flicker problem on top app bar
The height of top app bar area is dependent on the line count of
multiline title. This mechanism is always triggered when entering either
subsetting page or rotating the screen, regardless the state of
collapsing toolbar. That is saying this mechanism caused a flicker
problem or a title in wrong color. The mechanism will be updated to
check the state of collapsing toolbar to make sure that it is only
triggered if the collapsing toolbar is in expanded state.

Fix: 186419089
Fix: 187709056
Test: visual verified
1) Navigate to a subsetting page with multiline title
2) Rotate the screen to landscape mode and collapse the title
3) Rotate the screen to portrait mode and see if the title is in
collapsed state

Change-Id: I3da2403fa43913469e64bd37e761b41a083efd38
2021-06-24 16:04:36 +08:00
Yi-Ling Chuang
2a5553707e Revert transition codes from the base activity
Bug: 191335572
Test: robotest
Change-Id: Iaf0c3086586affb091f38097df19e68b7e49e19a
2021-06-22 17:37:37 +08:00
Mill Chen
3f8f0a4356 Dissable scrolling behavior for collapsing toolbar
We intended to make subsetting pages disable the scrolling behavior
within the collapsing toolbar area. The collapsing toolbar is still
able to be expanded/collapsed depending on the content of page.

Fix: 191614437
Fix: 189003332
Test: manual test
Cannot scroll/drag with the collapsing toolbar area

Change-Id: I6755268781b8b3d1a76bf71f9e39e6de4eeb76e3
2021-06-22 05:30:01 +08:00
Jason Chiu
3ab404c6ba Merge "Support category changed mechanism in homepage" into sc-dev 2021-06-18 09:25:46 +00:00
Jason Chiu
c713c3e8ea Support category changed mechanism in homepage
- Homepage cannot referesh UI whenever an injected component is changed
- Extract categories related codes to a mixin

Test: manual, robotest
Fixes: 179792445
Change-Id: I1c13c541ce07b9c36fe984a035623985b5603560
2021-06-18 16:00:29 +08:00
Yi-Ling Chuang
07775c5c28 Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser
In the previous CL, we only remove the flag when the transition is
enabled. This CL remove it entirely regardless of the existing of the
transition since we'll be using the default transition.

Bug: 186858442
Test: click on any work profile app and don't see task transition.
Change-Id: Ie93e87156ca49e4bccef28d75afc54161919da62
2021-06-17 16:29:15 +08: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
Yi-Ling Chuang
4d7da4a425 Remove FLAG_ACTIVITY_NEW_TASk when there is transition
Making activities launch in a separate task breaks the page transition.
Reviewed the history of the addition of these flags, they seem stale and
are no longer needed, so remove these when the transition is applied.

Bug: 189412031
Test: Tap on any badged entry and see it being launched in the same
task.

Change-Id: I60b2ec0b2772cd3bdc8c4ebbc83cedd2a603492a
2021-06-08 18:55:49 +08: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
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
Edgar Wang
d6b5bbb5cb Apply SettingsLib SeekBarPreference to Settings
Bug: 176818438
Test: robotest

Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
Yanting Yang
e7fbe489d1 Log class name to detect page scroll jank
Bug: 187306869
Test: robotests & take the trace and see the cuj section name

Change-Id: Idbaa62e764323f8c35c101caf2961b6c853c440f
2021-06-07 15:53:20 +08:00
Yanting Yang
90a9714cc0 Deprecate silky flag for official release
- Turn on the collapsing toolbar by default.
- Remove the silky flag from All apps page.
- Ignore tests of ChooseLockGenericTest and trace it on b/179136903.
- Remove silky flag.

Fixes: 183670633
Bug: 179136903
Test: robotests & visual
Change-Id: Iee2a9e7ccaebd1624f995af4fd45446142e5f500
2021-06-02 15:18:33 +00:00
Yi-Ling Chuang
e7c769fe02 Apply sliding transition to trust agent.
- Also rename the extra of page transition.
- Remove useless code while starting activity from fragment.

Bug: 187542491
Test: robotest and manually went through trust agent flow.
Change-Id: I55419f23db7fa77281039e642bde5558c17dce0f
2021-06-01 16:39:13 +08:00
Yi-Ling Chuang
8871134dcd Simplify the transition logic.
- Only override startAcitivtyForResult() as other methods will also fall
to that one.

Bug: 187542491
Test: rebuild and navigate through pages
Change-Id: I2d5cf0c3deaa858d44c4330600e88b0f33ce0594
2021-05-26 15:51:02 +08:00
Yanting Yang
c10cfff485 Merge "Remove silky flag from Apps for official release" into sc-dev 2021-05-26 02:09:19 +00:00
TreeHugger Robot
32ea479cc9 Merge "Apply setup wizard's transition on a11y pages" into sc-dev 2021-05-26 01:13:14 +00:00
TreeHugger Robot
332ee0f374 Merge "Support different types of transitions." into sc-dev 2021-05-25 11:49:59 +00:00
Yi-Ling Chuang
250858e4be Apply setup wizard's transition on a11y pages
- Start a11y activities with transition type.
- Only play fade out transition on these activities with transition type.

Fixes: 174540259
Test: rebuild and launch pages from Vision Settings
Change-Id: I7e8e0ee8cdb7a3f99cfc9a6e2d1623e2970511b7
2021-05-25 18:52:03 +08:00
Yi-Ling Chuang
8db5cb03eb Support different types of transitions.
In Settings, some cases are not suitable to apply the shared x-axis
transition, and some pages shared with SUW may need to apply other
transitions. Hence, create a mechanism for flexibility.

Bug: 187542491
Test: robotest & navigate though settings pages
Change-Id: I041bbb5e1d9177f234860864651f618700867b96
2021-05-25 14:13:02 +08:00
Yanting Yang
ba8e5802d4 Remove silky flag from Apps for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: If6df8a4191d5750edca22dd94b99c43ccebf2e04
2021-05-25 02:35:58 +08:00
menghanli
c3ce01cdde Apply color extraction for sub settings in SuW
Bug: 183713013
Test: Run initBCTestEnv_S.sh and apply different color
Change-Id: Ia06983a8bcfa9cbf190d0c73496b5d70660ffa4e
2021-05-24 11:56:31 +00:00
Yanting Yang
d62082027d Introduce InteractionJankMonitor into Settings
Detects the jank of page scrolling which is implemented by
InstrumentedPreferenceFragment.

Bug: 187306869
Test: verify with Perfetto

Change-Id: Icaa557d1b47a12374298f044e2f9568281589f64
2021-05-21 04:32:55 +00:00
Yi-Ling Chuang
81226a2431 Refactor some transition codes.
- Make the transition logic simpler in SettingsBaseActivity.
- Remove the redundant transition code in SettingsActivity.

Bug: 177479937
Test: rebuild and click on pages.
Change-Id: I65cae59d4eae99e3b9c324c9b6ce89f2349aaf8b
2021-05-20 16:20:28 +08:00
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
Alex Stetson
413893244d Merge "Use shared model for non-system overlay toggle" into sc-dev 2021-05-07 14:08:52 +00:00
Yi-Ling Chuang
377410de6d Merge existing bundle with ActivityOptions
Use Bundle.putAll() to take both the bundle passed in to the
startActivity(Intent, Bundle) and also the new created ActivityOptions
bundle, so no extra info will be lost.

Test: rebuild and add log to make sure all bundle info are kept
Bug: 187471344
Change-Id: I69c2978488f51f1c8ee705dc1bcd1bf17928fe33
2021-05-07 11:30:21 +08:00
Alex Stetson
aff80d1e14 Use shared model for non-system overlay toggle
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.

Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Matt Pietal
8850c3c677 Wallet/controls - Migrate existing settings
Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91
2021-05-06 08:35:13 -04:00
TreeHugger Robot
d3de9a1352 Merge "Apply settings page transition" into sc-dev 2021-04-28 13:41:04 +00:00
Yi-Ling Chuang
58813f7b6c Apply settings page transition
This change applies Shared X-Axis transition across settings pages. For
injected settings, the injected apps have to also apply the same
transition to take effect.

Fixes: 177479937
Test: robotests and navigate through settings pages
Change-Id: I6241860766f5969428faf9a5b3730a7614fdcd92
2021-04-28 17:29:49 +08:00
Mill Chen
4d6bbc8af9 Make collapsing toolbar load font synchronously
Since collapsing toolbar might load the font asynchronously, it caused
that some settings pages are seeing a flicker on its title. This change
is using TextAppearanceConfig.setShouldLoadFontSynchronously(true)
method to have title font load synchronously, which would remove the
flicker problem.

Fixes: 182232144
Test: visual verified
1) Enable developer options
2) Settings > System > Developer options
3) See if there's a flicker on title

Change-Id: I4e1db1a0fae9f69c7ff5baca7ada49c08f1bcbea
2021-04-28 11:45:52 +08:00
TreeHugger Robot
ea7b64a96d Merge "Fix background inconsistency of the font size page in SUW" into sc-dev 2021-04-23 09:21:28 +00:00
Mill Chen
7edebeef7e Combined biometric settings implementation
There will be multiple biometrics authentications existing at the same
time, so we added a new page for multiple biometrics to control
biometrics settings.

Bug: 183449119
Test: manual test
Change-Id: I359082caf771e07dfd5b24973cb8a3cf372c1b30
2021-04-23 15:18:08 +08:00
Sunny Shao
2ba1ab2222 Fix background inconsistency of the font size page in SUW
- Apply to SUW provided theme.
- Use isSetupWizardDayNightEnabled to decide which device's SUW supports dark mode.

Fixes: 184901818
Bug: 186076332
Test: manual test
Change-Id: I44c5f8ee19dac58dea7f5543840659c08aad4a39
2021-04-23 15:12:11 +08:00
TreeHugger Robot
ea2a359561 Merge "Update the style for collapsing toolbar" into sc-dev 2021-04-22 06:40:23 +00:00
Matt Pietal
6e8286fbb6 Remove "Device Controls" from Settings
Both device controls and wallet have moved to new areas outside of the
power menu. In step 1, we are removing the device controls settings,
as the user can now fully control availability within the new Quick
Settings device controls tile.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.gestures
Change-Id: Ib9a8c36c0532c095e58bc0ec085b788fc84945d7
2021-04-20 07:54:12 -04:00
Mill Chen
86fd923d6f Update the style for collapsing toolbar
The new version of collapsing toolbar has been updated and it needs
the edge-to-edge configruation to work smoothly. Added the configuration
for Notification history and removed useless styles.

This change is also trying to reuse the layout that is from SettingsLib
and remove the one from Settings.

Bug: 183496853
Test: visual verified
Change-Id: Iecfb96fe5ead91b0421050c3dfc1c1ab456aafff
2021-04-19 20:48:03 +08:00
Mill Chen
feae056067 Tweak the layout of top app bar
- Update the color of content scrim
- Dynamically change the height of collapsing toolbar according to the
  line count of title
- Fix the jank problem of collapsing toolbar

Fixes: 184615642
Fixes: 185003521
Fixes: 182770567
Fixes: 184209747
Test: visual verified
Change-Id: I78c517eb9bec0b85997085970007481d1a4ef7d3
2021-04-19 17:29:18 +08:00