Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,418 Commits 1 Branch 0 Tags
cdf991a7baa495e10ae3ab341ec6772de210bddd
Commit Graph

38707 Commits

Author SHA1 Message Date
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
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
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
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
Mill Chen
dc4ec9bfca Update animation for fingerprint edu page 
Bug: 197264655
Test: visual verify
1) Navigate to fingerprint unlock and start fingerprint enrolling flow
2) Observe the education page and see if the animation works

Change-Id: Id07ee17fac29f8f49babb137889e50514ec86326
 2021-10-26 15:16:50 +08:00
TreeHugger Robot
1568b185a5 Merge "Fix the NPE when input a wrong package" into sc-v2-dev am: baa58563bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115939

Change-Id: I6f31dab56fdc71f617dad4a4e0d471093d843aca
 2021-10-26 03:42:47 +00:00
Weng Su
3b99a81e78 Move android.settings.WIFI_SETTINGS action to Internet Settings 
- Starting from S, the WiFi Settings is changed to Internet Settings

- Redirect to WiFi Settings if Provider Model disabled

- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted

Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
 2021-10-26 03:39:13 +00:00
TreeHugger Robot
baa58563bf Merge "Fix the NPE when input a wrong package" into sc-v2-dev 2021-10-26 03:30:59 +00:00
Joshua Mccloskey
f0a55f7c4e Fixed bug causing user to be stuck on face intro 
Test: See below
Fixes: 203375738
Change-Id: I3e59191a8c936c7c7a3d8561e908593dbf9710b5

1. Enrolled a face during SUW
2. Pressed back on fingerprint enroll intro
3. Verified that the next button's text is chnaged to done
4. The done action launches the fingerprint enroll intro flow.

Change-Id: Id5d652257445e40426ade3d396a31ebf936cc348
 2021-10-25 15:08:51 -07:00
Sarah Chin
6f405c9c46 Merge "Remove IMS from editabe APNs" into sc-v2-dev am: 4a78032f62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048825

Change-Id: I68b1b77616fcd72d4bd07133c8b7881f8a64ac8c
 2021-10-25 17:07:34 +00:00
Sarah Chin
4a78032f62 Merge "Remove IMS from editabe APNs" into sc-v2-dev 2021-10-25 17:05:10 +00:00
YUKAI HUNG
22a28d3f7e Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev am: 0ed32fca75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115940

Change-Id: I953a2e45433c6f7c563392ab98272261b37f3e9e
 2021-10-25 17:02:36 +00:00
YUKAI HUNG
0ed32fca75 Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev 2021-10-25 16:49:01 +00:00
ykhung
36a57f4720 Fix the ExpandDividerPreference will flash one time in some corner cases 
Bug: 204051529
Test: make SettingsRoboTests
Change-Id: Iaead6d2a596cbbf0281045b40e4b00f23ceb9f09
 2021-10-25 22:22:49 +08:00
Sunny Shao
8b437cd9c3 Fix the NPE when input a wrong package 
- The mAppEntry is null when got a wrong package.

Bug: 201950262
Test: manual test
Change-Id: I582ec61d816e6f6c3332e4a21d86fb37f3a4354b
 2021-10-25 19:38:58 +08:00
TreeHugger Robot
ac5fa697d2 Merge changes from topic "two_pane_state" into sc-v2-dev am: 05896ef5fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101559

Change-Id: I5f42aebba8811cc3d1711f709e71c3d82c529443
 2021-10-25 09:09:43 +00:00
TreeHugger Robot
05896ef5fb Merge changes from topic "two_pane_state" into sc-v2-dev 
* changes:
  Create an interface to access the two pane state
  Update logic to check two pane resolution
 2021-10-25 08:55:27 +00:00
Tsung-Mao Fang
54b9d60783 Create an interface to access the two pane state 
Create an new interface in the embedding provider,
this interface tells if settings app is in two pane or not.

To access the activity in the content provider, we need to store
the activity reference in the app application layer.

Test: See if two pane state is correct.
Bug: 203763572
Change-Id: Iae2245b84af2683d932f1900df9959dad98370d7
 2021-10-25 15:43:17 +08:00
ykhung
7681f7ee7f Log battery saver schedule type and percentage when its value is changed am: aa73e48950 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101562

Change-Id: I7f555cccd53ae5c6e9e564d339042264e0601208
 2021-10-25 04:03:40 +00:00
ykhung
96c6fcb778 Remove saver schedule type logging entry from BatterySaverController am: 58ff194380 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101561

Change-Id: Id7810fa1777a91cdb404dd892117e42516d25417
 2021-10-25 04:03:37 +00:00
ykhung
aa73e48950 Log battery saver schedule type and percentage when its value is changed 
Bug: 15125481
Test: make SettingsGoogleRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: Ia728a4ea2da3930201d5634abda7aa8a8dd72133
 2021-10-25 10:40:08 +08:00
ykhung
58ff194380 Remove saver schedule type logging entry from BatterySaverController 
Bug: 15125481
Test: make SettingsGoogleRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I698c4ef71217ecd68034cd5761e2b94cd868b38f
 2021-10-23 15:27:37 +08:00