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

97817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
41cfaa9f29 Merge "Phone fails to switch channel mode from stereo to mono" 2021-11-01 06:02:26 +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
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
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
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
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
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
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
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
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
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