Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,588 Commits 1 Branch 0 Tags
ae5f30b15acce1c825b8fef3d34223853a9a687a
Commit Graph

40107 Commits

Author SHA1 Message Date
Jason Chiu
ae5f30b15a Merge "Declare a highlight menu key for ButtonNavigationSettingsAssistController" 2021-11-02 02:14:09 +00:00
TreeHugger Robot
5aa5035a9b Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c am: cdf991a7ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410

Change-Id: I5676cec612866c434204bbc6f548415a2508bbb6
 2021-11-01 22:04:07 +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
9abf3e5e76 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933 am: 137f9acac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: I53031d3f0c7abe2ac1a089534f0908c939ffb49c
 2021-11-01 08:20:08 +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
1e00dc9c9a Declare a highlight menu key for ButtonNavigationSettingsAssistController 
Bug: 204695404
Test: manual
Change-Id: I787824d0a4ef79d697bb7cd254fca6fb9b64d16f
 2021-11-01 15:32:39 +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
TreeHugger Robot
3cea3fc075 Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f am: 4ef8d14ed7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16056987

Change-Id: If60cc218966a7bfaa6a466b02d5c3419ddd9f386
 2021-11-01 03:01:29 +00: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
c8e465afc9 Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev am: e1ec69fa1a am: 6230bf1f1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926633

Change-Id: I70ba529a3db9c804b7014c9ae5cc25b0ba53a341
 2021-11-01 02:37:20 +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
d9d4866004 Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev am: c1b5f7883c am: 31ec8a9128 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145690

Change-Id: I53557ce86744f44a2e43af451c286c054bb1646d
 2021-11-01 01:57:31 +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
c8c3f5c9b4 Merge "Update animation for fingerprint edu page" into sc-v2-dev am: 4b40fa5016 am: c5230ce87e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091075

Change-Id: I3375ef423097e7bad8f1fba5d657fec23908eea8
 2021-10-29 18:54:13 +00: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
TreeHugger Robot
16122bf9ce Merge "Fix make Bluetooth discoverable without additional permission" 2021-10-29 13:27:42 +00:00
Tsung-Mao Fang
e3f34ef7db Merge "Register the rule for injected apps" into sc-v2-dev am: 29063a7981 am: 04c7515603 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138631

Change-Id: I51b34f59603d0fc78679402ca951e90743f67c6b
 2021-10-29 10:02:37 +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
Hugh Chen
d3abbb9821 Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

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

Change-Id: Ic8f685b0fb1ba4c1c2d2570b4a2a52288d087d95
 2021-10-28 01:08:28 +00: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
977ae95131 Merge "Fix usages of renamed Association class" 2021-10-27 21:18:22 +00:00
TreeHugger Robot
0e97ec6ac8 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b am: babbff7b82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I5186454ec25051276f1b0583b7d203314143f59d
 2021-10-27 19:52:38 +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
Jernej Virag
27850e9e9e Merge "Add setting to allow configuration of long press home gesture" 2021-10-27 09:59:31 +00:00
Sergey Nikolaienkov
0a319ece22 Fix usages of renamed Association class 
Fix use of the Assocition class, which has been renamed AssociationInfo.

Bug: 194301022
Test: make SettingsRoboTests
Change-Id: I00e3c76c219c36bc8da0dadfb8727d1c217bba18
 2021-10-27 09:05:34 +02:00
Arc Wang
1607221483 Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev am: 527667b375 am: 369884106e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16123443

Change-Id: I3d1b6de91c559af2aa73355c4a8ae430975b5463
 2021-10-27 06:35:28 +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
Joshua Mccloskey
7571e874f7 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c am: 23e3603e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: Iea31095d21a01ef5847ae009331251f1e1df10a5
 2021-10-26 18:24:43 +00:00
Joshua Mccloskey
23e3603e69 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: I46e6989e1e50718b09263d2d24c16105276016a9
 2021-10-26 18:05:13 +00:00
Joshua Mccloskey
fd96fe156c Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev 2021-10-26 17:49:36 +00:00