PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,473 Commits 1 Branch 0 Tags
bede66283d7c7d77ed6c7df54cf12b6fd89fceba
Commit Graph

98473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bede66283d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours am: 931145f30e -s ours am: 1639e278b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5e93d402a0f5a4764300d298bc4e0d65c54617
 2021-11-18 18:56:39 +00:00
Bill Yi
1639e278b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours am: 931145f30e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d5616815c882ac9ba6d2fcdd3f1425dc0835080
 2021-11-18 18:33:03 +00:00
Bill Yi
931145f30e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
 2021-11-18 18:08:17 +00:00
TreeHugger Robot
003ae71f95 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-mainline-prod am: ec4cfd92aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I72a0a9804f2f65aa309a00447ae1f7cc55f7cfeb
 2021-11-18 18:07:20 +00:00
TreeHugger Robot
4d300f5038 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 2p: a4d089c738
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 17:51:48 +00:00
TreeHugger Robot
ec4cfd92aa Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 17:51:48 +00:00
TreeHugger Robot
8aef66f1bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours am: 6e7435398e -s ours am: 17896e0e7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09f2430c5457815abd4b7e97e32dd86f0261226c
 2021-11-18 17:44:57 +00:00
TreeHugger Robot
c2c3cdc25f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours am: 0b17afd619 -s ours am: ff7e972fa7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71f7c1253c71e6226c1b448ad2337d5827d369f3
 2021-11-18 17:44:40 +00:00
TreeHugger Robot
17896e0e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours am: 6e7435398e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a7fc5c781d8d73fbccf99b4409ba2985f253c33
 2021-11-18 17:20:03 +00:00
TreeHugger Robot
ff7e972fa7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours am: 0b17afd619 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f0a50f7dd8d75e9d82cb7a820d0d6bd69e87d74
 2021-11-18 17:19:56 +00:00
TreeHugger Robot
6e7435398e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabd4701965c8f88c200a616310481fd330114671
 2021-11-18 17:02:48 +00:00
TreeHugger Robot
0b17afd619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
 2021-11-18 17:02:38 +00:00
TreeHugger Robot
fda2135c78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:57:43 +00:00
TreeHugger Robot
621e22f9f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7b6c97337b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I928633cfd8e462a9eb2b1530a69f5e6b813e7c8a
 2021-11-18 16:56:32 +00:00
Bill Yi
edc5c3f5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 428a285829 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35bff92a5e9bdb2a3ce2ae06c23ba60f28e20856
 2021-11-18 16:56:20 +00:00
TreeHugger Robot
7b6c97337b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-11-18 16:55:33 +00:00
TreeHugger Robot
f30fec793b Merge changes from topic "presubmit-am-c5edf37e63de4edc8b1bc7c31fee956e" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b25362f540
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-18 16:55:33 +00:00
TreeHugger Robot
5cd9181ad9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-11-18 16:53:30 +00:00
TreeHugger Robot
277f726266 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:49:54 +00:00
Matt Pietal
eecacebf5d Merge "Allow a settings override for double-line clock" 2021-11-18 15:14:33 +00:00
Bill Yi
2c292c3bd0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
 2021-11-18 11:14:31 +00:00
Bill Yi
940d57f51c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6fc823c379438a052b94846b0e4b05663a18249
 2021-11-18 11:06:43 +00:00
Bill Yi
c3da08f9b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14e8407dfd64beac27fc43769f7009427f477027
 2021-11-18 11:01:28 +00:00
Bill Yi
ec854d1d31 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 2p: a4d089c738 
Blank merge reason: parent was merged -s ours

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

Change-Id: I9a3f6328f7c0cdfed687173183e2247d3e6eb620
 2021-11-18 11:00:11 +00:00
Bill Yi
d86da91c3e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1988d2aea846cc00ec8929d7e898f821a686c5cc
 2021-11-18 11:00:03 +00:00
Bill Yi
a4d089c738 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic42dc91bbba1f38ab4b6ec1a0dc9a5c20dd74610
 2021-11-18 11:00:03 +00:00
Bill Yi
b8b0bef8f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
 2021-11-18 10:59:55 +00:00
Bill Yi
428a285829 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12a53b0b2120d995bd75eb25e9b0f1d006af8d86
 2021-11-18 10:55:43 +00:00
Bill Yi
3cb4a606cb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b25362f540 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ibdc90746222efdc9f2fbd583bd8c3fb4b488b2fa
 2021-11-18 10:52:18 +00:00
Bill Yi
b25362f540 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e1a0be4a803f0a0ff07474df142d97139f304dc
 2021-11-18 10:52:11 +00:00
Betty Chang
8ed7411e88 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8 am: 4375590837 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228

Change-Id: Ie89df57dc909dd6e7272c799bfd390a476b2a4cd
 2021-11-18 06:47:22 +00:00
Betty Chang
38874a5fd7 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431 am: 023e325653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: I73b425791f6f81dcd0538399d8449aa8ca29dd38
 2021-11-18 06:47:11 +00:00
Betty Chang
4375590837 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228

Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
 2021-11-18 06:30:27 +00:00
Betty Chang
023e325653 Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915

Change-Id: Id0a6f3124c0df3332f4b808ba7251a181f0bb483
 2021-11-18 06:30:05 +00:00
Betty Chang
21967a6ff8 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev 2021-11-18 06:18:08 +00:00
Betty Chang
34ff040431 Merge "Remove the string for wifi toggle summary" into sc-v2-dev 2021-11-18 06:17:52 +00:00
TreeHugger Robot
e4dca4c6db Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a am: 2fc75eba80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Ib2df8aa1538faf51d375dc92cc978039f0da9768
 2021-11-18 03:52:25 +00:00
TreeHugger Robot
2fc75eba80 Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
 2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev 2021-11-18 03:25:05 +00:00
Jason Chang
a40471e4bf Merge "(3/n) Handling long-pressed action for One-handed mode Quick Settings tile" 2021-11-17 23:38:03 +00:00
Matt Pietal
a5415907ea Allow a settings override for double-line clock 
This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
 2021-11-17 19:29:19 +00:00
Makoto Onuki
694d374a9c Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577 am: 0fefda6870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438

Change-Id: I81b0c86610090a295801fb13295b15b94a501ba6
 2021-11-17 18:11:17 +00:00
Makoto Onuki
0fefda6870 Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438

Change-Id: I8629b6ad36ffc18364a09f859497fecd93368b98
 2021-11-17 18:05:05 +00:00
TreeHugger Robot
8027459563 [automerger skipped] Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee am: 6274ca81fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieede0d8433136aac3c6585c9b060d60264e9b2b5
 2021-11-17 18:00:07 +00:00
Matt Pietal
4942988d02 [automerger skipped] [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486 am: d8ca5298ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0babc7ed0c88806d5763cb97af0fe43f4c43c59c
 2021-11-17 18:00:04 +00:00
Makoto Onuki
fcb067b577 Merge "Use different exceptions for different crash reasons" into sc-v2-dev 2021-11-17 17:52:56 +00:00
TreeHugger Robot
6274ca81fa Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: I243c8725d48e167e32785ab08ce40864588f1746
 2021-11-17 17:41:28 +00:00
Matt Pietal
d8ca5298ec [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359

Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
 2021-11-17 17:41:24 +00:00
TreeHugger Robot
b13b2fd8ee Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev 2021-11-17 17:12:37 +00:00
changbetty
39ebb7c9a8 Remove feature flag for provider model in wifi settings 
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
 2021-11-17 15:57:14 +00:00