PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,838 Commits 1 Branch 0 Tags
f488cf541630c81e88a2caeeb49e93ba68ce51f0
Commit Graph

87838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
bdf999d90a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie4ee5453ddb85e01767e31d1d99d92d43c4dfc9d
 2021-09-02 13:34:27 +00:00
Bill Yi
71904cfc78 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9d02ac4cb07e74c28f89f88f0048068ac5ecfaba
 2021-09-02 13:32:52 +00:00
Bill Yi
914dc714a2 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 
Blank merge reason: commit message contains skip directive

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

Change-Id: I2255e2a4c1e9ad286e4e9d7c956bcd6c6ede66d0
 2021-09-02 13:31:27 +00:00
Bill Yi
fefa801325 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id0c33c816383e6f8336bac7c1f4a8a065df86f5d
 2021-09-02 13:31:27 +00:00
Bill Yi
fb4f0b0820 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
 2021-09-02 13:31:17 +00:00
Bill Yi
8382ada407 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
 2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
 2021-09-02 13:23:16 +00:00
Bill Yi
c71f1a2fce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib76b04af514d6c2179f8f56a4e1ef47885e595cc
 2021-09-02 13:11:52 +00:00
Bill Yi
4f514d351e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I964e86741a41b4135f26b107e2ce0cbe713a463d
 2021-09-02 13:06:49 +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
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
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
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
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