PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,371 Commits 1 Branch 0 Tags
8adc1c1d96820fc54be6c1ff76c20ebd0a9e4ad2
Commit Graph

89371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8adc1c1d96 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours am: fe2a7627dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18afc701bd10e2bdf4e04db7145590bf8f73e54e
 2021-11-01 06:19:01 +00:00
TreeHugger Robot
53c3e1d04e Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 5a64962814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I4d6fbc2713b8b1d8a1a9d8706dfcf11ce69abbed
 2021-11-01 06:18:59 +00:00
Bill Yi
350c637e83 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours am: de92464a0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I929e8b617b585c00b45fd5205d8bf0f8de46aa0c
 2021-11-01 06:18:58 +00:00
TreeHugger Robot
6c62f6369e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: 0f8deae0af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefb02e3e992df75d24a0fc34f44ff186769f5a18
 2021-11-01 06:18:03 +00:00
TreeHugger Robot
3ee9239392 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: c2041123e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d09a7f799ef07c68ba4f8628191b36c78e43248
 2021-11-01 06:17:50 +00:00
Bill Yi
6e0c66918c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours am: c7d8d778f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39b88cd1163dcf256e9e2843f5334c6970b0883f
 2021-11-01 06:16:39 +00:00
TreeHugger Robot
fe2a7627dc [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68302835fcfada607ef1cf80f4c679c65699d0ee
 2021-11-01 06:16:34 +00:00
TreeHugger Robot
5a64962814 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I3175b04e7b6c59b7a675512be558b4870d32ab68
 2021-11-01 06:16:33 +00:00
Bill Yi
de92464a0c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4a6047e56b639be353cb14b19adfd63bf40f1f5
 2021-11-01 06:16:32 +00:00
TreeHugger Robot
0f8deae0af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide5328620945f0989b8aacf67e250e73a1acfdb5
 2021-11-01 06:15:54 +00:00
TreeHugger Robot
c2041123e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2b5ae5a0ee45eac93c237309dc30d40ee4ae6b4
 2021-11-01 06:10:53 +00:00
TreeHugger Robot
0563e86e06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b450a4518e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I942b1d25db14ad23f152950bff601997495e7b95
 2021-11-01 06:09:43 +00:00
Bill Yi
c7d8d778f6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b1933d93a4d2387bfc4ac4707acccaf60f28727
 2021-11-01 06:09:26 +00:00
TreeHugger Robot
3b8fc0d70d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1cc1696a72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie258f3052d629939970747f06e287e1964240ffe
 2021-11-01 06:08:43 +00:00
TreeHugger Robot
b450a4518e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-01 05:50:09 +00:00
TreeHugger Robot
1cc1696a72 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-01 05:50:07 +00:00
TreeHugger Robot
15e9a44b45 Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev 2021-11-01 05:46:15 +00:00
TreeHugger Robot
49400133f1 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:46:15 +00:00
TreeHugger Robot
07709bfd9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:45:59 +00:00
TreeHugger Robot
b41f6a01a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:45:56 +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
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
Bill Yi
09c3e9d968 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idaaac25178500ad4fe455421d80cda021d31a7bd
 2021-10-31 02:35:13 +00:00
Bill Yi
2225c633ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2cf4ffb1e23f9c01b186dd8c65988da06d008c5b
 2021-10-31 02:31:38 +00:00
Bill Yi
c0eaec8037 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a 
Blank merge reason: commit message contains skip directive

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

Change-Id: I424e234e0577d940e6da8a625b4797a292a759c6
 2021-10-31 02:28:09 +00:00
Bill Yi
eb45210f6a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78c311e7d058b10e7b00112ceda5e3ed03381370
 2021-10-31 02:28:03 +00:00
Bill Yi
6347c41779 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f6487847b7169e47594ce435ca5eb59b6ecfde3
 2021-10-31 02:20:16 +00:00
Bill Yi
3931bcc9cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I698355eed5bae2d3d247b65f0b41caefbd821d3a
 2021-10-31 02:18:46 +00:00
Bill Yi
afcfca4582 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iaf86f2c81249458d953ebae715c53b83f8570dbe
 2021-10-31 02:17:25 +00:00
Bill Yi
88711716d8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id2247aaee46863a606dad86c2cc62ca2bd4c6592
 2021-10-31 02:17:24 +00:00
Bill Yi
6ac425087d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7cf4620b089df8bac86ad67c4efffe0ae3f5ad95
 2021-10-31 02:17:16 +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
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
Weng Su
1fe930bd06 [automerger skipped] Keep compatibility for old WiFi shortcut am: e739b3c99b -s ours 
am skip reason: Merged-In Idb08b9650e7c5efce4ab40eb949ccab0e5949333 with SHA-1 8cf3250517 is already in history

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

Change-Id: Ie03d0dd37944c85fe919cf0cb3e85e6828a010d4
 2021-10-29 07:24:44 +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
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
e66bcb7884 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: 3d353e63e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I941bc47a6914c606b26c6f68f383791f6635c34b
 2021-10-27 19:31:46 +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