PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,297 Commits 1 Branch 0 Tags
ec49cd01821a3b09d6e4bc305504077ddac52ab0
Commit Graph

84297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ec49cd0182 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c5ee2d9be3458991e2e5130a302d0e6d8d08641
 2021-09-03 20:57:00 +00:00
Bill Yi
a87573a588 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I49900fb9eb356739642c89c568fc64cc28e2d1c2
 2021-09-03 20:55:45 +00:00
Bill Yi
af37131dd0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cb5efcd328f63618808b24111a0dc86bad57b42
 2021-09-03 20:55:44 +00:00
Bill Yi
0660fbec64 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:34:05 +00:00
Bill Yi
b0f2b985f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45e89df28a0955ea1b3b854c393c09c8083ad991
 2021-09-03 20:23:32 +00:00
Bill Yi
b33a9e9bca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida46ec1fe7ee8f08e606a823761b80da7f217d1a
 2021-09-03 20:06:28 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
 2021-09-03 19:55:43 +00:00
TreeHugger Robot
5050698472 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours am: 9902d7a14b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57980dcaf54f815017641c6adb7a39a8be55838d
 2021-09-03 17:53:42 +00:00
Bill Yi
3e508b953b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours am: 65fa976c50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cd97c62e9315366b425d9e50c6320cdb2a90267
 2021-09-03 17:53:37 +00:00
TreeHugger Robot
9902d7a14b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc3146a3ffaaeb3184b40b09cbb8faf3b17a4941
 2021-09-03 17:35:57 +00:00
Bill Yi
65fa976c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6698a049f45900b997140b3edba8e6276258a41c
 2021-09-03 17:35:17 +00:00
Ember Rose
3377f1c04e Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev 2021-09-03 17:17:38 +00:00
TreeHugger Robot
3a95d44f50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
 2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
 2021-09-03 17:15:14 +00:00
Tsung-Mao Fang
07037dbc3f Revert "Support two pane design in the Settings app." 
This reverts commit a12a0d1eb2.

Reason for revert:  See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug

Bug: 198722766
Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c
 2021-09-03 17:12:47 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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