Commit Graph

38727 Commits

Author SHA1 Message Date
Jason Chiu
3b3203cd50 Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571

Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
2021-11-03 12:23:46 +00:00
Jason Chiu
80dd47633c Merge "Search experience improvement for large screen" into sc-v2-dev 2021-11-03 12:08:35 +00:00
Jason Chiu
e427cc6752 Search experience improvement for large screen
- Support fragment and direct link in SearchResultTrampoline
- Start activity for SI case and start deep link trampoline for others
- Disable menu highlight whenever the search bar is clicked
- Don't overwrite SettingsApplication's homepage activity in
  SliceDeepLinkHomepageActivity
- Scroll to highlighted menu entry after homepage is loaded to prevent
  UI overlapping

Bug: 201724410
Test: manual, robotest build pass
Change-Id: I5115d17d829e85036000da2e80f0e5b0598c733f
2021-11-03 18:44:01 +08:00
Wesley Wang
e67f12f9b7 Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I033d0ff341cae7cdb320abebfd1da765c6fa8e74
2021-11-03 06:55:06 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Wesley Wang
bf9f91f0ad Merge "Move optimization mode backup timing into onPause" into sc-v2-dev 2021-11-03 06:41:42 +00:00
Jason Chiu
1565bba600 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev 2021-11-03 06:38:46 +00:00
TreeHugger Robot
3be2b733f2 Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0 Merge "Adjust optimize page logging timing" into sc-v2-dev 2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3 Move optimization mode backup timing into onPause
- Move to onPause to avoid some corner case (like kill apps from recent
 app won't trigger onDestroy)

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
2021-11-03 12:38:10 +08:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Wesley.CW Wang
7fb4cbf005 Adjust optimize page logging timing
- Log the optimize mode only when leave this page and mode changed
 - Update mOptimizationMode at onResume to make sure the state is sync
 with framework

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iab116220cd7d2b1bdb1c170c4b47016c763bf4fe
2021-11-03 12:05:15 +08:00
ykhung
b85bf67314 Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737

Change-Id: I06e12f5250b7abe8ce5546cf3c91952f6704fe6e
2021-11-02 18:13:07 +00:00
ykhung
8f0291cd1a Fix NPE issue of usage detailed page learn more button click event
root cause: some OEMs can not provide valid intent for help & feedback
solution: check the intent is vaild or not before show up the help content

Bug: 204844010
Test: make RunSettingsRoboTests
Change-Id: I4e7a7c926205be1179d55d33ada345024c8a44ab
2021-11-02 16:34:34 +00:00
ykhung
00bc734b6a Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323

Change-Id: Ibcf69b3ff520458b486fdecd0ec92d8983167bac
2021-11-02 10:30:50 +00:00
ykhung
ae5bddc5e5 Avoid intermediate touch hover effect when a11y is enabled
Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I08e64a73547f71281fa94dc56ba8fe08312ebed0
2021-11-02 16:47:31 +08:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32 Merge changes from topic "slice-highlight" into sc-v2-dev
* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
TreeHugger Robot
cdf991a7ba Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410

Change-Id: Iea2d9bad655ee100c9aba65310307e8c988cfa7e
2021-11-01 21:52:44 +00:00
TreeHugger Robot
faf0721f2c Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev 2021-11-01 21:37:29 +00:00
Daniel Chapin
ba0a012b57 Revert "Update animation for fingerprint edu page"
Revert submission 16091075-update_lottie_fp_edu

Reason for revert: Droidfood Blocking Bug: 204719520
Reverted Changes:
I0c3b1ad93:Update animation for fingerprint edu page
Id07ee17fa:Update animation for fingerprint edu page

Change-Id: I0f301491c2b526443a40b916ac2d98093d80a759
2021-11-01 19:36:00 +00:00
Bonian Chen
7f94d2ba0e Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289

Change-Id: I2b2c907e8341e1b80cc6145998dccc7a5dfab8cf
2021-11-01 14:06:24 +00:00
Bonian Chen
5d1400f8b2 Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev 2021-11-01 13:56:03 +00:00
TreeHugger Robot
137f9acac1 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: Ic9d497517b6778c413909917d485575a054dc331
2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933 Merge "Optimize battery optimize page control flow" into sc-v2-dev 2021-11-01 07:53:21 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Wesley.CW Wang
151b88f76f Optimize battery optimize page control flow
- Post the setup logic into background and setup once only when leaving
 this page, this can improve the performance since we won't setup
 every time when switching preference

Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
2021-11-01 14:52:42 +08:00
Jason Chiu
594eb43159 Support slice deep links highlighting menu entries
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
  CustomSliceable at syntax level
- Update the slice index db schema

Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
2021-11-01 14:27:34 +08:00
TreeHugger Robot
4ef8d14ed7 Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987

Change-Id: I7b9a5992c671ed304e3ad2cdec7f546d6c77b446
2021-11-01 02:50:16 +00:00
TreeHugger Robot
17df1ff01f Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev 2021-11-01 02:41:30 +00:00
Jason Chiu
6230bf1f1c Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev am: e1ec69fa1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926633

Change-Id: I2b407cb2d53996f9432e6770ce586358e5c44b7d
2021-11-01 02:23:26 +00:00
Jason Chiu
e1ec69fa1a Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev 2021-11-01 02:10:21 +00:00
Arc Wang
31ec8a9128 Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev am: c1b5f7883c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145690

Change-Id: Icb336250f28c1b8a05369bb63b1ad3facb8e5a83
2021-11-01 01:47:04 +00:00
Arc Wang
c1b5f7883c Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev 2021-11-01 01:27:37 +00:00
Arc Wang
a63e9c625d [Large screen] Make slice deep linking to Settings show in 2-pane
- add a standalone home activity for slice deep link.
- add EXTRA_IS_FROM_SLICE to control the slice deep link flow.
- Intent#parseUri fails if the intent data schema is set.
  Add EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA to relay the
  data schema.

Bug: 201397123
Test: manual, robotest
      1.  Say 'Enable NFC'/'Enable Bluetooth'to Google assistant.
      2.  Click the the NFC/BT Slice.
Change-Id: Ia3216956328c32b2109cb2d70ad1105327661f26
2021-10-31 20:12:27 +08:00
TreeHugger Robot
c5230ce87e Merge "Update animation for fingerprint edu page" into sc-v2-dev am: 4b40fa5016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091075

Change-Id: I177a51b2c06b2cf4c8a385016b3b091a73a1c357
2021-10-29 18:42:32 +00:00
TreeHugger Robot
4b40fa5016 Merge "Update animation for fingerprint edu page" into sc-v2-dev 2021-10-29 18:24:18 +00:00
Arc Wang
54998b7bfe [Large screen] Fix searched Subsettings back navigation bug
Settings app registers SubSettings SplitPairRule with clearTop
true, it will finish Settings app if users click back button on
a SubSettings page.

This change registers SubSettings SplitPairRule with clearTop
true when users click a SubSettings item in Settings home menu.

And this change registers SubSettings SplitPairRule with clearTop
false when users click a SubSettings item in search result.

Bug: 204501750
Test: manual
      1. Settings -> Search settings -> search a SubSettings item
         (e.g., Battery)
      2. Click the searched item.
      3. Click back button.
Change-Id: I6e1862de528e971137ae7087de608bbdd79096b2
2021-10-29 17:45:40 +08:00
Tsung-Mao Fang
04c7515603 Merge "Register the rule for injected apps" into sc-v2-dev am: 29063a7981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138631

Change-Id: I8665e1e055bf237b7d1a1f261b8eb7a3a9cf19cf
2021-10-29 09:45:24 +00:00
Tsung-Mao Fang
29063a7981 Merge "Register the rule for injected apps" into sc-v2-dev 2021-10-29 09:31:11 +00:00
Tsung-Mao Fang
bb24a2f63b Register the rule for injected apps
We should align behavior between injected apps and in-app entries.

Test: Open the Google/DW page and click back key. Then, app is closed
directly.
Fix: 204406425

Change-Id: I57831c4df78b502b3998b3f7384df2900dbfe56f
2021-10-28 18:27:12 +08:00
TreeHugger Robot
7272c9d036 Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944

Change-Id: Icbecef23b576b84f0d1a30fe8c294e81a1f12a45
2021-10-28 00:49:08 +00:00
TreeHugger Robot
929e577e1b Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev 2021-10-28 00:35:01 +00:00
TreeHugger Robot
babbff7b82 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: Ib6922d82c5c6d7a059b8c43beefb12d554c3f3c0
2021-10-27 19:28:38 +00:00
TreeHugger Robot
c26248da5b Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
3d353e63e2 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I6057ce7a0de2ff19f662564a538a891d9c37c553
2021-10-27 18:52:19 +00:00
TreeHugger Robot
649135c11c Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev 2021-10-27 18:24:26 +00:00
Arc Wang
369884106e Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev am: 527667b375
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16123443

Change-Id: Ic97c1ecba5d4502f97ab0972cd0042f8dfaf9e58
2021-10-27 06:16:16 +00:00
Arc Wang
527667b375 Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev 2021-10-27 05:56:04 +00:00
Arc Wang
3ff6f14f43 [Large screen] Shows SearchActivity at right pane
This change removes alwaysExpand ActivityRule registration
for SearchActivity.

Bug: 204260066
Test: manual
      Settings -> Click 'Search settings'
Change-Id: I4625756bf89568fcdf690e5930b76c3e2ece5043
2021-10-27 11:45:59 +08:00