YUKAI HUNG
7613e04b9b
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 81decdadae
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 2401ec4235
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I16e38ecb1bd5abac0d8516c0308c58a9b8a066d7
2021-09-03 02:58:00 +00:00
YUKAI HUNG
81decdadae
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Id51f71a57433dd11eae2b3e50290c5d010afda4c
2021-09-03 02:49:14 +00:00
TreeHugger Robot
6ed6c30067
Merge "Support two pane design in the Settings app." into sc-v2-dev am: 9e1b5fb825
am: c2fff38feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674256
Change-Id: Ica30fd1745fe7d08661493251b11b3fae92d34e7
2021-09-03 02:49:08 +00:00
TreeHugger Robot
c2fff38feb
Merge "Support two pane design in the Settings app." into sc-v2-dev am: 9e1b5fb825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674256
Change-Id: I185099bd485e55a15e8e67fee0adfa38bf662f8f
2021-09-03 02:37:46 +00:00
YUKAI HUNG
3f1d329878
Merge "Hide Camera background running time in the battery usage screen" into sc-dev
2021-09-03 02:33:22 +00:00
TreeHugger Robot
9e1b5fb825
Merge "Support two pane design in the Settings app." into sc-v2-dev
2021-09-03 02:26:58 +00:00
Tsung-Mao Fang
a12a0d1eb2
Support two pane design in the Settings app.
...
1. Only enable this feature when the flag is on and library is supported
in this device.
2. Add a placeholder rule for home menu.
Network page will be shown to the right pane by default.
3. Add a rule for most sub settings pages.
Known issues:
1. Transition animation seems wrong in this cl.
2. App is closed if user taps back key on the second layer page in fold
state.
Test: Run the apk on large screen device and regular phone. No crash
happens
Bug: 197716926
Change-Id: I089717e84c5e92c6e5b02d9770a24376e250fea2
2021-09-02 13:57:42 +00:00
Treehugger Robot
ce4f483f56
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
am: fb1bf5f85e
am: e81eb6bd40
am: bc3d304f1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I5db1e2bb4b6e446f1866ea2f252359e588e5c28e
2021-09-02 10:01:09 +00:00
Pasty Chang
fa780e76e5
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev am: 25ff749e7b
am: 6b3c1efab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15734709
Change-Id: I4c176ed96a2ef7db5e07ec231ad42f500cdab179
2021-09-02 10:00:34 +00:00
Treehugger Robot
bc3d304f1a
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
am: fb1bf5f85e
am: e81eb6bd40
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I971b57659f2fe1c2179ed85b2300d60cb2fb9215
2021-09-02 09:51:37 +00:00
Pasty Chang
6b3c1efab2
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev am: 25ff749e7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15734709
Change-Id: I8f7cc9ada0e7f9e4d060e5b06352dcc2dab52b58
2021-09-02 09:48:36 +00:00
Treehugger Robot
e81eb6bd40
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
am: fb1bf5f85e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I11c518f21390017a8aa93e8c201ecc3da752b5c1
2021-09-02 09:38:25 +00:00
Pasty Chang
25ff749e7b
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev
2021-09-02 09:34:43 +00:00
Jason Chiu
4f8c4bc7df
Merge "Fix Robolectric broken on SplitController" into sc-v2-dev am: 6318bb23a0
am: fc37054461
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747142
Change-Id: I286f34d305d544df2eb7bc53ede8e9e352e91c29
2021-09-02 09:26:20 +00:00
TreeHugger Robot
f8b6a8297c
Merge "Move legacy hide applications in usage screen list to SettingsGoogle" into sc-v2-dev am: 11d6ba6f57
am: 0d4e7a27e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737567
Change-Id: I0a749bf60f06c8c9aa06ad8bc2a3ae222229d4e3
2021-09-02 09:26:12 +00:00
Treehugger Robot
fb1bf5f85e
Merge "Support multi-users for NFC payments" am: 6eb702ed63
am: 6eb3f3bf90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
2021-09-02 09:25:52 +00:00
Jason Chiu
fc37054461
Merge "Fix Robolectric broken on SplitController" into sc-v2-dev am: 6318bb23a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747142
Change-Id: I2f6ffc7ff726aa50887cf2f5e099cc329cede2bb
2021-09-02 09:17:20 +00:00
Treehugger Robot
6eb3f3bf90
Merge "Support multi-users for NFC payments" am: 6eb702ed63
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
2021-09-02 09:17:20 +00:00
TreeHugger Robot
0d4e7a27e4
Merge "Move legacy hide applications in usage screen list to SettingsGoogle" into sc-v2-dev am: 11d6ba6f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737567
Change-Id: Ic2fb658dc7e42e87660564e6b3cf28df06fb0b43
2021-09-02 09:17:05 +00:00
Jason Chiu
6318bb23a0
Merge "Fix Robolectric broken on SplitController" into sc-v2-dev
2021-09-02 09:13:46 +00:00
TreeHugger Robot
11d6ba6f57
Merge "Move legacy hide applications in usage screen list to SettingsGoogle" into sc-v2-dev
2021-09-02 08:58:33 +00:00
Treehugger Robot
6eb702ed63
Merge "Support multi-users for NFC payments"
2021-09-02 08:56:28 +00:00
Jason Chiu
348cfdbf61
Fix Robolectric broken on SplitController
...
Fixes: 198563284
Test: robotest
Change-Id: I1f4cd3c972fed4da171feadb8c31b858c85c6757
2021-09-02 08:13:45 +00:00
ykhung
0a03758738
Move legacy hide applications in usage screen list to SettingsGoogle
...
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106
2021-09-02 11:57:54 +08:00
TreeHugger Robot
0a7368cd1d
Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev am: 041d8cdb5a
am: 4468048125
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697677
Change-Id: I14c48c9f340903b4066e9ca0235ebe5fcabeb15d
2021-09-01 18:33:59 +00:00
TreeHugger Robot
4468048125
Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev am: 041d8cdb5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697677
Change-Id: Iea9d977556a7963a43f6d5e6b6cdeb071223e012
2021-09-01 18:22:06 +00:00
TreeHugger Robot
041d8cdb5a
Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev
2021-09-01 18:08:51 +00:00
TreeHugger Robot
622e910981
Merge "Phone fails to switch channel mode from stereo to mono"
2021-09-01 09:47:24 +00:00
Tim Peng
1469626b4a
Phone fails to switch channel mode from stereo to mono
...
-Set codec to SBC when HD audio is off
Bug: 194349060
Test: make -j50 RunSettingsRoboTests
Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
2021-09-01 08:42:30 +00:00
Menghan Li
7e398e58e4
Merge "Fix a11y service icons are tiny after changing display size to "Largest"" into sc-v2-dev am: da1154403a
am: 2bc4a74954
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15659644
Change-Id: I438810bda2c84f5bc336b5e51ab230e405c44615
2021-09-01 07:30:41 +00:00
Menghan Li
2bc4a74954
Merge "Fix a11y service icons are tiny after changing display size to "Largest"" into sc-v2-dev am: da1154403a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15659644
Change-Id: I5626624e21c0084f861fee45a6a9b67167695bf1
2021-09-01 07:16:03 +00:00
Menghan Li
da1154403a
Merge "Fix a11y service icons are tiny after changing display size to "Largest"" into sc-v2-dev
2021-09-01 06:56:57 +00:00
Menghan Li
ac74f5e31a
Merge "Fix null pointer issue of accesibility learn more button click event" into sc-v2-dev am: e8582f9c31
am: 355ae871b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15678258
Change-Id: I199e6d1b3f30cacfac3a15010242f9f5a4dc3239
2021-09-01 06:56:27 +00:00
pastychang
38c857bd60
Fixed WiFi dialog force closed when physical window size is changed.
...
When window size is changed, dialog should not be dismissed on the destroy. It will cause dialog to be shown from on create and then dismissed from on the destroy right away.
Bug: 190573335
Test: manual
Change-Id: I995c3cbf90a9ec3c5305ef57e655b0b0eb7cf5cc
2021-09-01 06:52:44 +00:00
Menghan Li
355ae871b5
Merge "Fix null pointer issue of accesibility learn more button click event" into sc-v2-dev am: e8582f9c31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15678258
Change-Id: Ifc595fa8d33e5244b96d28ef17615e1955b20551
2021-09-01 06:28:24 +00:00
Menghan Li
e8582f9c31
Merge "Fix null pointer issue of accesibility learn more button click event" into sc-v2-dev
2021-09-01 06:19:03 +00:00
Lucy Chang
d4035c2cdf
Merge "Log accessibility privacy warning status (2/2)"
2021-09-01 06:04:04 +00:00
Zoey Chen
71a30a323a
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
am: 4e1fba40ee
am: facfcc0041
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: Iac49a15922bfab8fc2e56c72fdfe125cbf87a90c
2021-09-01 04:37:21 +00:00
Zoey Chen
f239d07930
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
am: 2d827ddf50
am: ae633368e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: Ie2720c20b131abbb2f68e56df3887bfad80048ae
2021-09-01 04:36:58 +00:00
Zoey Chen
facfcc0041
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
am: 4e1fba40ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: Ifaaca2ba26687e6ff5e5292d5e420f06e387d36b
2021-09-01 04:23:28 +00:00
Zoey Chen
ae633368e2
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
am: 2d827ddf50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: I7bb2dbb8b1bcba2d6d568397158e3512c0b2df61
2021-09-01 04:22:59 +00:00
Zoey Chen
2d827ddf50
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: Ie210682def804b99f21e3803d95c4d14828af77c
2021-09-01 04:12:08 +00:00
Zoey Chen
4e1fba40ee
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801
Change-Id: If81f3187cbda733d168a8fbe6a692a89fbb41129
2021-09-01 04:12:08 +00:00
Zoey Chen
f25a00217c
Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev
2021-09-01 03:58:13 +00:00
Joe Bolinger
cfddf7ead6
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: bc188f609c
am: 478de12b83
am: 2abb74cdd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: Ie5da2ca50721c7576f4ada585f0251c98318a5b7
2021-09-01 02:08:52 +00:00
Joe Bolinger
07b88db72b
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: bc188f609c
am: 9133578aaa
am: 2b4b5d3b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I5a7654bcd86c168dc80c9e665b8857f7f102b715
2021-09-01 02:08:44 +00:00
Joe Bolinger
c2dd62371a
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: 46470d911e
am: 95626d62f3
am: 374cbccbf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I3b6bad0c0ef62ccca60bf7854b812e0cbd4cf0de
2021-09-01 02:08:11 +00:00
Joe Bolinger
2abb74cdd3
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: bc188f609c
am: 478de12b83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I471343acd465b3556beb807cfb142f1746de70eb
2021-09-01 01:59:25 +00:00
Joe Bolinger
2b4b5d3b73
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: bc188f609c
am: 9133578aaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I19e1251d9b830be8bb25f00d4850053e774b0ca7
2021-09-01 01:58:47 +00:00
Joe Bolinger
374cbccbf0
Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
am: 46470d911e
am: 95626d62f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133
Change-Id: I25649534415e9c8685195c419f9450def18fc0d0
2021-09-01 01:58:29 +00:00