PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,937 Commits 1 Branch 0 Tags
e1ec69fa1ac969140e13a644e182b97f27f49dc4
Commit Graph

84937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Weng Su
e739b3c99b Keep compatibility for old WiFi shortcut 
- WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in R, update to S and test it
Bug: 199033769
Change-Id: I735106578cd11a15ffef1fd4d8e9703ae781db6c
Merged-In: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
 2021-10-28 07:27:06 +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
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
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
TreeHugger Robot
9b325cd54f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I3d7ff4a2ccb00a5e9f8a8488051f4d464efc986a
 2021-10-27 02:11:09 +00:00
TreeHugger Robot
700fe7493b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572

Change-Id: I2575e86ccc14baf32e0424a3e936d0a1b00cad4d
 2021-10-27 02:11:04 +00:00
TreeHugger Robot
9f6ae4ff97 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4
 2021-10-27 02:11:01 +00:00
Bill Yi
39e322145f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Id35f11c2ecea70a0b98a0479a62e5f10d361f915
 2021-10-27 02:11:00 +00:00
TreeHugger Robot
034ff149d1 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: Ia522af0c4e271be71c76a52b4b8497311950fcc7
 2021-10-27 02:10:52 +00:00
Bill Yi
80ff342b4a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I548359fef73f55692e18df0a511c932ae0b7e9b1
 2021-10-27 02:10:51 +00:00
TreeHugger Robot
48b79c4f7d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: If077afe3d023be33c98959da914fff0e3a59b0e5
 2021-10-27 02:10:44 +00:00
Bill Yi
9153fc1720 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705

Change-Id: Ifd794d4c6533dd6ed2b188d115fd044a512c8068
 2021-10-27 02:10:44 +00:00
TreeHugger Robot
778ae33620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-27 01:50:53 +00:00
TreeHugger Robot
5416ffde47 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-27 01:50:49 +00:00
TreeHugger Robot
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-27 01:50:49 +00:00
TreeHugger Robot
7b45d4a7ac Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-27 01:50:46 +00:00
TreeHugger Robot
336aa9899c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-27 01:50:37 +00:00
TreeHugger Robot
0317f233ce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-27 01:50:35 +00:00
Bill Yi
0e6f17b4fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic913ba48bfa2a032682246df0175852aa8bee859
 2021-10-26 18:11:34 +00:00
Bill Yi
141d4127f8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I356d775f02056287568b055d49f755efdf1ef901
 2021-10-26 18:07:42 +00:00
Bill Yi
8c035094b8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Ia5cac899e699134c9c3dededfec0419871b5f097
 2021-10-26 18:04:03 +00:00
Bill Yi
49389665fa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a2e84d9174edd3eaff854cd7197147fa7888baa
 2021-10-26 18:03:56 +00:00
Bill Yi
16c371fe43 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7dcedca7a4057f9765dfe306c3134f8f82c757e0
 2021-10-26 17:55:56 +00:00
Bill Yi
9975577fd7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I24332f87c03f57644fd6ffb3d1819f184a54a170
 2021-10-26 17:54:07 +00:00
Bill Yi
f7af4b6fb0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I73f1f4c5f9b93372fd9d02f9b193922c751526cc
 2021-10-26 17:52:36 +00:00
Bill Yi
a6de7ad6b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
 2021-10-26 17:52:29 +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
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
Ganesh Olekar
f24702f643 Merge "Update toggle string for cam and mic access" into sc-v2-dev 2021-10-25 17:14:07 +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
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
TreeHugger Robot
c07317f5a1 Merge "Fix broken tests" into sc-v2-dev 2021-10-25 12:15:57 +00: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
Tsung-Mao Fang
1083ca0b90 Fix broken tests 
Test: Run presubmit
Bug: 204031530
Change-Id: If95afeff91b2fb81b18bfdf6005ba785c6dc1525
 2021-10-25 17:22:01 +08: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
Arc Wang
f1d527ff0b Merge "Fix layout problem in "All apps" view" into sc-v2-dev 2021-10-25 07:04:37 +00:00