PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,386 Commits 1 Branch 0 Tags
8b3792d65bf01618d5391c4e16dc765ea9c565fc
Commit Graph

83386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
8b3792d65b Add string ids to the result bundle for parental consent. 
Bug: 198491515
Test: N/A (builds)
Change-Id: Id120f5f7a7e923f9d3ce7dd38d3e5214296ca219
 2021-09-14 19:54:27 +00:00
Bill Yi
790491bc0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -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: I2fff9127a356f4942996e07da5ecc57d9b60bd92
 2021-09-03 20:56:02 +00:00
Bill Yi
e49c8b9929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -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: I81ecebfcb12ac6b2909fad8999e83c22a9cae361
 2021-09-03 20:55:53 +00:00
TreeHugger Robot
0c0b1bf900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1a90ba04044295d8653a1b3b3ce9e86b4c4d3cc
 2021-09-03 20:55:01 +00:00
Bill Yi
6178db1a47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:35:13 +00:00
Bill Yi
aa77dc6ebb Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:35:13 +00:00
Bill Yi
a8c5a69b8d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:34:05 +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
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
 2021-09-03 20:22:37 +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
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +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
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
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
TreeHugger Robot
f1780afb1e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-09-03 16:50:43 +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
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
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
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
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
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
Zoey Chen
f25a00217c Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev 2021-09-01 03:58:13 +00:00
Joe Bolinger
bc188f609c Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Ifd9ebd5877ce8020c0c977db8f6744c03ca24c70
 2021-09-01 01:26:40 +00:00
Joe Bolinger
c7a0b63dd9 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev 2021-09-01 01:15:40 +00:00
TreeHugger Robot
736bce563e Merge "Log when DEBUG is on" into sc-qpr1-dev 2021-08-31 22:19:19 +00:00
Zoey Chen
35803a3b03 [Provider Model] Add a cutout for signal icon if the mobilde data is disabled 
Screenshot: https://screenshot.googleplex.com/57wPkj9pq9hP5WA.png

Bug: 198233143
Test: manual, atest SubscriptionsPreferenceControllerTest
Change-Id: I3caefc7e1ca10dadcad114273edf35d9309502e1
 2021-08-31 16:03:23 +00:00
ykhung
4e3f692164 Hide Camera background running time in the battery usage screen 
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
 2021-08-31 13:58:13 +00:00
ykhung
ba35874594 Hide Camera background running time in the battery usage screen 
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
 2021-08-31 07:49:07 +00:00
Weng Su
1f6f807834 Don't show Wi-Fi icon if the level is -1 
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
(cherry picked from commit 7e14668094)
Merged-In: Ifddc9aace42d1f024b7c861b1207f651061d790b
 2021-08-30 22:55:26 +00:00
Bill Yi
7514b30f06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd84831c2a7385823179a9bf6c9ad66c744e9eff
 2021-08-29 20:29:02 +00:00
Bill Yi
3fb65a4774 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2eeded04160aee20dfbdb492b9ce770a829dab25
 2021-08-29 20:27:44 +00:00
Bill Yi
31208c4948 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:43 +00:00
Bill Yi
0d2b7238bc Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:43 +00:00
Bill Yi
a5d0f92e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:03 +00:00
Bill Yi
b7f7a895fd Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:03 +00:00
TreeHugger Robot
82f0ae4930 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I010271c153b50c9212a4e01afb37db572250f252
 2021-08-28 08:38:28 +00:00
TreeHugger Robot
cf5b05d878 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94d31a6410c30f8a60630080903996c52e8fe51d
 2021-08-28 08:38:25 +00:00
Bill Yi
eb2a13ee8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc16e48f3fd33b2b0b0a6946cac9af62ca940512
 2021-08-28 08:38:08 +00:00
Bill Yi
9b3d8a4629 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d46d4c15e98ede68881bc469ff81d684f3f9205
 2021-08-28 08:37:45 +00:00