TreeHugger Robot
2ae8237fee
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-09-03 16:39:16 +00:00
YUKAI HUNG
856fae9042
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: e3f61dcf22
-s ours am: 3eaff9320b
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I5ac1844dca95bb8840aa25d202137116e3e5f6ba
2021-09-03 08:23:46 +00:00
YUKAI HUNG
9df034caee
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: bfb214953e
-s ours am: 7a618acca6
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: Icbe04a36aa976f0b8271c6af7d35310c8b25266a
2021-09-03 08:23:36 +00:00
YUKAI HUNG
3eaff9320b
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: e3f61dcf22
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I849ba40997a4726261da07aaa552e45682d75dd5
2021-09-03 08:10:16 +00:00
YUKAI HUNG
7a618acca6
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: bfb214953e
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: Id8de2dd27294e69bfe0ff6350030d94c15fa2599
2021-09-03 08:09:44 +00:00
YUKAI HUNG
bfb214953e
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: If14c84483416d18deb8b71db1750eeb89168a221
2021-09-03 07:52:46 +00:00
YUKAI HUNG
e3f61dcf22
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715977
Change-Id: I91cbfd0137a787f2202fcb20c2b2f2cce2adb50a
2021-09-03 07:52:45 +00:00
YUKAI HUNG
32e61bbeb7
Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev
2021-09-03 07:33:29 +00:00
YUKAI HUNG
6251f443da
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 1f1455a083
-s ours am: 819c36798c
-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: I51947677794a267e9a4d906b3889e0beb2ef9e86
2021-09-03 03:38:31 +00:00
YUKAI HUNG
2a78d336db
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 8d49d45f1e
-s ours am: bd77f257cf
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ifa23a6fa587ac9d8ff1c4e062f32fda13495c778
2021-09-03 03:38:24 +00:00
YUKAI HUNG
264ec4f47d
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
am: 0051f1e3e9
-s ours am: d1006b47b8
-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: I2d2308268fd993110c4cef686e9bb4edbe67e466
2021-09-03 03:38:16 +00:00
YUKAI HUNG
819c36798c
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 1f1455a083
-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: Ib4539cb29269aece1795e3bf43697389fb5a860f
2021-09-03 03:20:28 +00:00
YUKAI HUNG
bd77f257cf
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours am: 8d49d45f1e
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ibb59e31d9edcdfb723e88730c808e575b4e9dfd6
2021-09-03 03:20:07 +00:00
YUKAI HUNG
d1006b47b8
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
am: 0051f1e3e9
-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: I23b755bd071a96ea2f7e88e5a51049b0f4c270ef
2021-09-03 03:20:02 +00:00
YUKAI HUNG
1f1455a083
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-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: I387aa681c9cb1b37efb9bc69ddaddc0e45a31962
2021-09-03 03:03:48 +00:00
YUKAI HUNG
8d49d45f1e
[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: 0a11568b82
-s ours
...
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 4e3f692164
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ic2216021eb520273518a6ba7f91fc8b52ecdbfef
2021-09-03 03:03:46 +00:00
YUKAI HUNG
0051f1e3e9
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I760b2d0d9a85b271c6a11c0d0255a164d5aba6dc
2021-09-03 02:58:37 +00:00
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
0a11568b82
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: Ie57e3be9bda2316a8ee6a59fba76043ed6e61c54
2021-09-03 02:50:11 +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
YUKAI HUNG
fab65bcfe5
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: I39400598833b3de8ae60b6c9901fdbcc6015a16f
2021-09-03 02:48:48 +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
Bill Yi
18d3b50206
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id792adf45a5510dfc49c9e027c36fced0441dee1
2021-09-02 13:29:36 +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