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

97511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
00fc28d01d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: 0f8deae0af -s ours am: 6c62f6369e -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: I40b5ad291ae3ad35f6cfcc6576d79a21b4c45171
 2021-11-01 06:40:55 +00:00
TreeHugger Robot
0e90451e08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: c2041123e6 -s ours am: 3ee9239392 -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: Id158e2c8eb8aefccaa4fbc0007b76c8573f609f9
 2021-11-01 06:37:53 +00:00
Bill Yi
ae27fcd1a7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours am: c7d8d778f6 -s ours am: 6e0c66918c -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: I69610c513f283120cb012d6ad12bdd84c092d7ea
 2021-11-01 06:32:09 +00:00
TreeHugger Robot
ca3f658192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b450a4518e -s ours am: 0563e86e06 -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: Iede77b5a484271e7d07b8904bee7384387429589
 2021-11-01 06:25:44 +00:00
TreeHugger Robot
3df9f11dbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1cc1696a72 -s ours am: 3b8fc0d70d -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: Ib9af0cc1fa0f79f4db880a5ca5747886c502e042
 2021-11-01 06:23:37 +00:00
TreeHugger Robot
68a845fae0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 332ed7b0e7 -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: Ia51f265ea10d82cda9f106eeddc097ff9aff3e01
 2021-11-01 06:22:27 +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
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
332ed7b0e7 [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: Ia2eb07692a593e932b9b2aa34ebd9a615a693f2f
 2021-11-01 06:07:28 +00:00
TreeHugger Robot
1a935f200a [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-mainline-prod am: b1896538a0 -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: I5d8377cc758d3c9fc9415d56351a7d20304e53b0
 2021-11-01 05:53:44 +00:00
TreeHugger Robot
2ec88bc353 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-mainline-prod am: 8a373dd214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I92c7c73e0473918a9d22d80567146af2fd7a3e36
 2021-11-01 05:53:08 +00:00
TreeHugger Robot
9d3bacfc21 Merge changes from topic "presubmit-am-675c16673be14f3c9c962115ad9638ec" into sc-mainline-prod am: 97224a4a9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I1e8122f6787aa5d408959fce18a5479c420ad932
 2021-11-01 05:52:54 +00:00
TreeHugger Robot
ac1d5d0acc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 512eff5609 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I176f27feb262a1b95492273e4bf6bb80d182b13e
 2021-11-01 05:52:20 +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
b1896538a0 Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-mainline-prod 2021-11-01 05:46:15 +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
8a373dd214 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-mainline-prod 
* 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
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
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
97224a4a9b Merge changes from topic "presubmit-am-675c16673be14f3c9c962115ad9638ec" into sc-mainline-prod 
* changes:
  [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
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
512eff5609 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-11-01 05:37:43 +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
09c3e9d968 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idaaac25178500ad4fe455421d80cda021d31a7bd
 2021-10-31 02:35:13 +00:00