PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,456 Commits 1 Branch 0 Tags
c9b232049d05e355d0330d68fcf48b49f410bb36
Commit Graph

97456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c9b232049d Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6b115df1a" 2021-11-01 05:36:25 +00:00
TreeHugger Robot
0c47285c31 Merge changes from topic "presubmit-am-56eb7286928c4685bb8087fee9353543" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6b115df1a
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:36:25 +00:00
TreeHugger Robot
8e581bba8a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-11-01 05:36:21 +00: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
Bill Yi
65adf385a9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9cf54f0b457ae01515aa7c15179596056d2d135
 2021-10-31 02:23:51 +00:00
Bill Yi
b82339b63e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6b115df1a 
Blank merge reason: commit message contains skip directive

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

Change-Id: I044ceedb5d8de4d7dbce47660fd373b4ede1d6ed
 2021-10-31 02:13:11 +00:00
Bill Yi
4131eca8ec [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6b115df1a 
Blank merge reason: commit message contains skip directive

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

Change-Id: If42a782ec792d6c91332694380fc638b5994b6d8
 2021-10-31 02:13:11 +00:00
Bill Yi
a6b115df1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95b4317b63b5fde6187fe05c20c151bf9ae19e93
 2021-10-31 02:13:02 +00: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
Weng Su
2c61c57bad [automerger skipped] Keep compatibility for old WiFi shortcut am: e739b3c99b -s ours am: 1fe930bd06 -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: I6883c3870e76278636227de99e338fb0f9044794
 2021-10-29 07:41:36 +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
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
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
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
9f54b6f578 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: 3d353e63e2 am: e66bcb7884 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I9a039b1e7b13090c897fc8645822e709910d9026
 2021-10-27 19:52:52 +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
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
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
TreeHugger Robot
80e8d2b2d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours am: 0d439097e7 -s ours am: fb86b8e360 -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: Ica8084c4408c3b19b986be811e7b509a9aaefa8e
 2021-10-27 02:30:22 +00:00
TreeHugger Robot
6b9767cb21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours am: 2f0041e4d6 -s ours am: 98c574d941 -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: I68ceae33180048e4930b49e2ccb979da2a5d2553
 2021-10-27 02:30:16 +00:00
TreeHugger Robot
ac98462ff6 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 am: 9106e9620f am: ceaf6bb673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Iaeeca8bdcdc10efda537090243f34dc7caa670bf
 2021-10-27 02:30:09 +00:00