TreeHugger Robot
0f57a8f8ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours am: 16d1f56b9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747957
Change-Id: I56253c76b9cfbdce2270a8fee028acaac7d9ad3e
2021-09-03 17:03:16 +00:00
TreeHugger Robot
f213b7f82f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours am: 31d4dc9360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748131
Change-Id: I1e265bd64a26e52c4dd4dd5e440c8724ae8e3371
2021-09-03 17:02:55 +00:00
TreeHugger Robot
4d237e36d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747957
Change-Id: I7afb74d01977622f0e510a73ef300d255a18d273
2021-09-03 17:02:49 +00:00
TreeHugger Robot
16d1f56b9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747957
Change-Id: I9f23acfb28b8b87f61791d5ae1fcd2d68d655b3e
2021-09-03 17:02:42 +00:00
TreeHugger Robot
fae37889ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 84c4d4e69e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747958
Change-Id: I3d5eb3336ecfdc592d5f9138e9a5261b99615cde
2021-09-03 17:02:41 +00:00
TreeHugger Robot
31d4dc9360
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748131
Change-Id: Ie34c1b6d04b96e63047c190aa3b6132f23ec7303
2021-09-03 17:02:15 +00:00
TreeHugger Robot
0ce2aee04b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748131
Change-Id: Ifbb867e713d9ea9b71b8ee8e2412b63575cc5ba3
2021-09-03 17:02:12 +00:00
TreeHugger Robot
0157697765
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d9cd4e3358
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748132
Change-Id: I34b6f24208fdc9f779957b3797f4f500c0168ed1
2021-09-03 17:01:57 +00:00
TreeHugger Robot
f1780afb1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-09-03 16:50:43 +00:00
TreeHugger Robot
84c4d4e69e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:39 +00:00
TreeHugger Robot
d9cd4e3358
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:33 +00:00
TreeHugger Robot
a64f9f261b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:47:06 +00:00
TreeHugger Robot
76af5ca27c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:46:41 +00:00
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
changbetty
8dec2efc67
Change the SIM color for passing the GAR
...
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +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
menghanli
de883e063b
Fix color checking error of the repohooks
...
Fixes: 198538277
Test: repo upload
Change-Id: I313d37ce4a1d10f8bed6e98f9d9be412767a1e41
2021-09-03 08:42:10 +08: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
978866b335
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1762ddff56b9f08da6ccce5a6aabf15de7dfc115
2021-09-02 13:49:39 +00:00
Bill Yi
4a0398c888
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I76a03c3361848e96d981867535cb1c987ffc410f
2021-09-02 13:45:37 +00:00
Bill Yi
b14b8017bf
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
2p: 3c592eda3e
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: Ie18ea7faa3e46b54f43433fe2e3ad5f29346efe5
2021-09-02 13:42:11 +00:00
Bill Yi
8b34aa6114
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I6a79b22222a59807c26431c6a321cac377d599c2
2021-09-02 13:42:07 +00:00
Bill Yi
78c0f840f7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I11ad2115f0880746355ebc438586a606c5a0cc7a
2021-09-02 13:42:07 +00:00
Bill Yi
3c592eda3e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I01e8cfa05eb0ce3992fca191fe54e5fc1a6bbb7d
2021-09-02 13:42:07 +00:00
Bill Yi
1336ffec20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
2021-09-02 13:41:52 +00:00
Bill Yi
23953a78fd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia2e2834e2497d5a338fbfcd114f7097c1b2df34d
2021-09-02 13:38:07 +00:00
Bill Yi
bdf999d90a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie4ee5453ddb85e01767e31d1d99d92d43c4dfc9d
2021-09-02 13:34:27 +00:00