Commit Graph

631 Commits

Author SHA1 Message Date
Zaiyue Xue
6470ada117 Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:32:47 +00:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder.
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
TreeHugger Robot
6cd3d586a5 Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 2357b8ab44 am: 23eecdc87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I49cddbe7f0056b0801a0d07f2b704299df75e69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:02:28 +00:00
Jason Chiu
27c6b55ac5 Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.

Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.

Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Treehugger Robot
38f8c61722 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I9e3a0b69e3baf2c0691c898acda20d6a0b65b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:10:27 +00:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
2022-05-23 09:08:30 +02:00
Jason Chiu
5bc2dc4ae9 Simplify the duplicate click checker logic
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
TreeHugger Robot
baa2c48575 Merge "Filter out the duplicate click event on menu page" into tm-dev 2022-05-20 18:18:58 +00:00
Jason Chiu
e04dfaa29e Filter out the duplicate click event on menu page
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.

Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.

Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
2022-05-20 15:01:31 +00:00
Jason Chiu
26588fc2e5 Fix the work profile's deep link problem
- Settings shows the work Homepage while starting the work profile's
  icon, which is not allowed.
- Clicking work apps' App info plays an unsmooth window transition
  animation.

Fix: 233296965
Test: manual, robotest
Change-Id: I3d12f6c59692c4a4cc718ea7022b60be50235abb
2022-05-20 12:05:32 +08:00
Jason Chiu
44aab7c55f Merge "Refine the homepage app bar layout" into tm-dev 2022-05-16 02:01:20 +00:00
Jason Chiu
8847c3186a Refine the homepage app bar layout
- Polish the app bar mask on homepage
- Move the Suggestion card to the position below the search box

Fix: 224435133
Fix: 230284145
Test: robotest, visual

Change-Id: I0a4fd86230fb773a28ca1d9799f3c631a81a11cb
2022-05-13 09:37:00 +00:00
Jason Chiu
1b1c07afc4 Support the managed profile deep links for large screen
Homepage is not allowed to be started as a non-primary user.

In the managed profile deep link case, we create a bridge to start the
homepage as the primary user, and then start the target page as the
given managed user.

Bug: 222447112
Test: manual, robotest
Change-Id: I07dbec3b7eaff983f9860480a0a2f7b0e6f1fb43
2022-05-13 17:00:45 +08:00
Jason Chiu
c9615611e1 Reduce flickers of Injection
The injection dynamic data was loaded in the background and then post to
main thread to update UI. However, it usually updates after
Fragement.onResume(), which causes the flicker.

To make it more smooth, DashboardFragment to wait for the dynamic data
observers to update UI for a short period, which eliminates the flicker
in most cases.

Also skip the repeated tiles refresh called by onCategoriesChanged in
onResume after all preferences refreshed.

Test: robotest, visual
Bug: 229177114
Change-Id: I04650af9692703f1fc1e6e5ad2090f051b1eeb81
2022-05-09 12:33:54 +08:00
Tsung-Mao Fang
f4514b9fbf Fine tune background color for dual pane in homepage
Follow the spec and change the background color.

Test: See the screen
Bug: 223329504
Change-Id: Ibcbf0e898ae949e1354f5af810a2347eba42b508
2022-04-01 13:35:17 +08:00
Jason Chiu
680fce3acd Refine layouts for large screen
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
2022-03-30 04:54:30 +00:00
Jason Chiu
177573c892 Enhance Settings deep link transition
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.

To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.

Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
2022-03-24 12:42:01 +08:00
kholoud mohamed
de78149c16 RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
2022-03-17 17:37:45 +00:00
Jason Chiu
1c8e07438a Merge "Prevent scrolling after the homepage recreating" into tm-dev 2022-03-16 04:29:15 +00:00
Jason Chiu
764e7fbc44 Prevent scrolling after the homepage recreating
- Only apply the layout transition when contextual home is enabled
- Do not scroll for highlighting when the homepage is recreated and
  never scrolled

Fix: 222238012
Bug: 222473415
Test: robotest, manual
Change-Id: I490c3f8dbca63a5250bae01555592b7795c90af2
2022-03-14 15:13:08 +08:00
Tsung-Mao Fang
00cbd72c60 Rename back button to navigate up button
A minor wording review.

Test: build pass
Bug: 219000314
Change-Id: I23bc580b193cc891b659514d13705db2c55b756a
Merged-In: I23bc580b193cc891b659514d13705db2c55b756a
2022-03-07 08:47:30 +00:00
Tsung-Mao Fang
88bff1ebc5 Merge "Fix unable to scroll to the bottom page" into tm-dev 2022-03-02 03:13:01 +00:00
Tsung-Mao Fang
32c1fc76d8 Fix unable to scroll to the bottom page
We should set padding for root view instead of margin.

Test: Verify the behavior is correct in single pane
and two panes mode.
Fix: 221422906

Change-Id: I17a63be6e536ffcf39744b2e98dc1ea2723ebf1d
2022-03-01 11:51:03 +00:00
Jan Tomljanovic
aad5f295b0 Trigger SafetyCenter update on each Face setting change.
Test: atest SettingsUnitTests
Bug: 215518850
Change-Id: I7a55fd5368c9aad5329448732125d4e43688eced
2022-02-24 23:46:21 +00:00
Tsung-Mao Fang
39c8905f4c Fix incorrect colored bar when task bar is hidden
Set backgorund color on content id view instead of homepage view.
Also setup edge to edge for the homepage.

Fix: 215440529
Test: See correct ui on the two pane mode and regular phone.
Change-Id: I2d5988a489410e9620137bd6cf9607768787d4fc
2022-02-23 10:41:14 +00:00
Tsung-Mao Fang
2df79641cb Show/hide back button for 2nd page
By design, we want to show/hide back button for 2nd
layer page when it's in two pane mode.

Test: Manual test
Bug: 219000314
Change-Id: I14d8d7ee08280d5ce80c0b59e1e91d077f0b6d09
2022-02-16 18:01:42 +08:00
Jonathan Scott
e0d439472f Allow Device Management Role Holder to update Settings strings.
Test: manual
Bug: 188414370
Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
2022-01-25 19:03:24 +00:00
Tsung-Mao Fang
13a76eb84e Update new API for checking the embedding status
Test: Make sure behavior is correct as it was in
search flow, higlight flow, regular settings flow, split screen flow.
Bug: 204399167

Change-Id: I7fc29c8cdbfc6682963591f4ff805070bea4ca22
2022-01-12 15:00:07 +08:00
Jason Chiu
4f5f174a5e Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf am: 844a21e394
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440317

Change-Id: Ic8a87daefbc9d86ef11846bcea895c4c91661838
2021-12-10 17:34:44 +00:00
Jason Chiu
844a21e394 Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440317

Change-Id: I8a94d8977bd583a59ddd4a658ca50fd6708c2684
2021-12-10 17:16:51 +00:00
Jason Chiu
11d3b19c51 Fix the highlight error after unfolding the device
Unfolding a device generates mutiple lifecycle events and resets the
highlight key.

Check if there's only one activity in the task and then perform the
reset.

Fix: 209016927
Test: manual
Change-Id: I49988fa913270d35a04436777433b7669afb72df
2021-12-10 22:37:22 +08:00
Jason Chiu
f39248af7a Merge "Fix the highlight error and remove the empty card" into sc-v2-dev am: e06fb6348a am: 802c59c52e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16421586

Change-Id: I016bec5503b2e526e6ec62a9e50a0c3cf3227ef6
2021-12-09 10:10:16 +00:00
Jason Chiu
802c59c52e Merge "Fix the highlight error and remove the empty card" into sc-v2-dev am: e06fb6348a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16421586

Change-Id: Idacf7580710ead66aeec0c46261e447865f6247d
2021-12-09 09:23:57 +00:00
Jason Chiu
8c559c2788 Fix the highlight error and remove the empty card
Fix: 209918251
Test: manual
Change-Id: I2a5afceea18cd4e1009114091433a2da22ac105e
2021-12-09 15:09:09 +08:00
TreeHugger Robot
d58c0ab24e Merge "Improve the cold start performance" into sc-v2-dev am: b5687c464a am: 7162a4c3b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16386047

Change-Id: Ifa1baf38920b56429827a003106c95e9b8dbe748
2021-12-06 09:38:37 +00:00
TreeHugger Robot
7162a4c3b1 Merge "Improve the cold start performance" into sc-v2-dev am: b5687c464a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16386047

Change-Id: I4f34ac927281356ea602550d764bf4e86569d70b
2021-12-06 09:20:41 +00:00
Jason Chiu
d2e506fd20 Merge "Revise homepage highlight mechanism" into sc-v2-dev am: 7bfe3e869a am: 3b9ad4de7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16366004

Change-Id: Ib86f125d24836fb955d5dd31ec26f250460d3161
2021-12-03 09:46:31 +00:00
Jason Chiu
3b9ad4de7f Merge "Revise homepage highlight mechanism" into sc-v2-dev am: 7bfe3e869a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16366004

Change-Id: I0737a0463b51399a9410b238c23094715168f5ae
2021-12-03 09:27:13 +00:00
Jason Chiu
627fd3928c Improve the cold start performance
The performance regressed since the previous change that hide the
homepage view from using View.GONE to View.INVISIBLE

This change only initializes the list views in the invisible homepage
view to prevent a scroll flicker when scrolling is needed.

Test: manual
Bug: 206555277
Bug: 205823792
Change-Id: I8f173b135cfa1d27a1362d5fa8e3f338e2428ad2
2021-12-03 17:12:08 +08:00
Jason Chiu
a305c23f5e Revise homepage highlight mechanism
- Create TopLevelHighlightMixin to handle highlight actions and simplify
  TopLevelSettings
- Fix the error highlight and the flicker after screen rotation
- Postpone creating the fragment until it's needed to accelerate the
  initialization and to fix the search highlight function breakage after
  toggling light/dark mode
- Register activity embedding rules only once for injection and
  wallpaper
- Do not highlight Tips & support since it's full screen
- Refactor ActivityEmbeddingRulesController

Bug: 207316936
Test: manual, robotest build pass
Change-Id: If322ec180b03ee123987c70779a25c6a570d9faf
2021-12-03 12:04:48 +08:00
Tsung-Mao Fang
737288ff75 Update background color for two-pane mode am: 395ea90b83 am: e6a79f0670
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: Ifad1cd990154bc3e367921e94ea5c9d1d7b73ca5
2021-12-01 10:32:46 +00:00
Tsung-Mao Fang
e6a79f0670 Update background color for two-pane mode am: 395ea90b83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: I2b4fffda97aaec53945c4de4cf6248fb81163e64
2021-12-01 10:22:01 +00:00
Tsung-Mao Fang
395ea90b83 Update background color for two-pane mode
Update background color for status bar and
homepage background programically.
Also, we update the backgroud color for highlight items.

Test: Rebuilt apk and see the screen.
Bug: 195293058
Change-Id: Id100f8c9c7fc02c43420afcca07a703a14ec2312
2021-12-01 16:39:09 +08:00
Charles Chen
a1c4d9b702 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 am: 181853efb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d
2021-11-29 05:20:52 +00:00
Charles Chen
181853efb0 Fix different behaviors of deeplink in one/two pane am: a8c97980a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
2021-11-29 05:02:31 +00:00
Charles Chen
a8c97980a6 Fix different behaviors of deeplink in one/two pane
Test: manual - Reproducible steps mentioned in bug
fixes: 207740082
Change-Id: I1163e38c177307ccac8798eb649271d0466ab1c8
2021-11-26 07:54:42 +00:00
TreeHugger Robot
9eaf11e0c9 Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev am: aee951dcb0 am: 517c9ead5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16304401

Change-Id: I21d8dab4ebc3292bf49a50e518531f3c07098a5b
2021-11-24 18:44:52 +00:00
TreeHugger Robot
517c9ead5e Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev am: aee951dcb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16304401

Change-Id: I6da649fe2bf00d7630af90298c971928082092bb
2021-11-24 18:28:01 +00:00
TreeHugger Robot
aee951dcb0 Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev 2021-11-24 18:16:37 +00:00
Jason Chiu
90eef24080 UI refinement of highlighted menu entry for large screen
- Add a new highlight background drawable
- Add two homepage specific preferences for the new layout design

Fix: 207079684
Test: visual
Change-Id: I20c80da090a03129bffa845d443ee5d1ad13b97b
2021-11-22 12:36:05 +08:00