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

97478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
eff521d95d Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: 85caed014a" 2021-11-01 05:46:15 +00:00
TreeHugger Robot
5bb1a23e9b Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: 85caed014a
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
 2021-11-01 05:46:15 +00:00
TreeHugger Robot
3e2563914b Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: ee5ca96096" 2021-11-01 05:46:15 +00:00
TreeHugger Robot
b5f6cab51f Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: ee5ca96096
  [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
cd8ba6ada0 Merge changes from topic "presubmit-am-675c16673be14f3c9c962115ad9638ec" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a 2p: 51793e6774
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:45:41 +00:00
TreeHugger Robot
18d495042c Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa69ef7563" 2021-11-01 05:37:43 +00:00
TreeHugger Robot
061e08f627 Merge changes from topic "presubmit-am-11f6a43839be4ba8b27f706a6c07af9f" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa69ef7563
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:37:43 +00:00
TreeHugger Robot
d3b8244e1d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-11-01 05:36:36 +00:00
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
7ad86802ff [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a 2p: 51793e6774 
Blank merge reason: parent was merged -s ours

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

Change-Id: I470bb6f75681ffe643a562c54c7ca7f167bd2652
 2021-10-31 02:28:15 +00:00
Bill Yi
51793e6774 [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: If44285eb7a38415fecf40c989d97cdb25bb16357
 2021-10-31 02:28:10 +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
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
7d7396912a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: 85caed014a 
Blank merge reason: parent was merged -s ours

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

Change-Id: I5d2d7966f2cc72b5107841f806af8d09cbae3e5b
 2021-10-31 02:17:35 +00:00
Bill Yi
ac1fe98b10 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: 85caed014a 
Blank merge reason: parent was merged -s ours

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

Change-Id: I866e1b70a1a22a6b1b2cd7dbb65587fbc3184451
 2021-10-31 02:17:35 +00:00
Bill Yi
201fcc7b07 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: ee5ca96096 
Blank merge reason: parent was merged -s ours

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

Change-Id: Iccf66d9e6af9a0a9e585da51cbf133343c56e6ea
 2021-10-31 02:17:34 +00:00
Bill Yi
6a93182754 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 2p: ee5ca96096 
Blank merge reason: parent was merged -s ours

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

Change-Id: I2f02e9dc02babb5d60c20d8a65924156776d972f
 2021-10-31 02:17:33 +00:00
Bill Yi
85caed014a [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: Iee0f0ffcbc08f80ccf7be8f3144566db8da5dd4c
 2021-10-31 02:17:24 +00:00
Bill Yi
ee5ca96096 [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: I9bf08be9b01a2198bd22d0e85974e439d1ac452c
 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
Bill Yi
4969f6ec70 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1d6c7aa971046f5363777839113dcbec7634f69e
 2021-10-31 02:15:42 +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
Bill Yi
b82c3bb248 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa69ef7563 
Blank merge reason: commit message contains skip directive

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

Change-Id: I55cef815f4d5560c22df726e83f5153bb8e25812
 2021-10-31 02:09:36 +00:00
Bill Yi
499a7eb6a2 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa69ef7563 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1cf985aedd9623bdec4843eee87ac5fef8162061
 2021-10-31 02:09:36 +00:00
Bill Yi
aa69ef7563 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia22dd56a3e997d37f775a86f0c58ff4d5fb6607c
 2021-10-31 02:09:28 +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