PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,992 Commits 1 Branch 0 Tags
571f09d5a9be2448fbfe707c9dc66ed4e2e24f2c
Commit Graph

89992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ba70207c32 [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: I69192d5e771481b661a57df56af96ee381266152
 2021-11-01 06:15:52 +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
89064bf1a0 [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: Id5baf58d797f4636670fed2e29f23240cc4ad6e6
 2021-11-01 06:10:16 +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
0bf0236ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -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: Ibe25649cc892e6767cdbd40fba4a9ab16c26cb90
 2021-11-01 06:08:54 +00:00
Automerger Merge Worker
ebb11f1e6e Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp 2021-11-01 06:08:44 +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
803a4a84a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -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: Ic300b54ea954c625fcd08a35b286ecf9d043aa50
 2021-11-01 06:08:42 +00:00
Bill Yi
433960b45e [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: I736645f705abdc03f0605ff32d79c83f9a600366
 2021-11-01 06:08:42 +00:00
Bill Yi
4080a4ffd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours am: d497dee907 -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: I9b5a544ae99432f715513b7f027b224390706e47
 2021-11-01 06:08:41 +00:00
TreeHugger Robot
671b1b64a7 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f -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: If4b3001c37cd7cf10fe0e93e3d470c93f818fca0
 2021-11-01 06:07:51 +00:00
Bill Yi
94b058a0c1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 4f200606a9 -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: Ibeeacf435f58eb6f036b97f7534c544bdf76bf1d
 2021-11-01 06:07:51 +00:00
TreeHugger Robot
3ef8ed0bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -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: Ie05f2dd5247c2582f411909a3158feb48e38868e
 2021-11-01 06:07:03 +00:00
Bill Yi
d497dee907 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -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: I49b58ceae1ee8e4fafb5cd304f589a4a300347db
 2021-11-01 06:06:48 +00:00
tim peng
41cfaa9f29 Merge "Phone fails to switch channel mode from stereo to mono" 2021-11-01 06:02:26 +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
33b0ddcb9f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-01 05:46:15 +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
dfb6af177f Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp 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
7e2d3bd5ff [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: I78ebb7336ae52609b9372f4659b6a8cf4483e942
 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
4f200606a9 [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: I15b4087acf755a12fda81f4de18caf0f532165fa
 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