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

84703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
71904cfc78 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9d02ac4cb07e74c28f89f88f0048068ac5ecfaba
 2021-09-02 13:32:52 +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
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
Treehugger Robot
6eb702ed63 Merge "Support multi-users for NFC payments" 2021-09-02 08:56:28 +00:00
Zoey Chen
2d827ddf50 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: Ie210682def804b99f21e3803d95c4d14828af77c
 2021-09-01 04:12:08 +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
9133578aaa Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 am: bc188f609c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Ia27a78476731d285774ca6640414c3670a031d36
 2021-09-01 01:43:36 +00:00
Joe Bolinger
95626d62f3 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 am: 46470d911e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Idaec22cc49b17bc088380ec4da7ce51e2f037856
 2021-09-01 01:43:26 +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
46470d911e 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: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
 2021-09-01 01:25:27 +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
0164a3a724 Merge "Log when DEBUG is on" into sc-qpr1-dev am: 736bce563e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15598813

Change-Id: I527bfca7a4397af216b2abd2b04ab157d1ad1adf
 2021-08-31 22:40:47 +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
dc50ca86fb Don't show Wi-Fi icon if the level is -1 am: 1f6f807834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350

Change-Id: Ib8e3164f046f2deeca88e6d31e29058789751edc
 2021-08-31 03:21:47 +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
6ee3b9fe8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 7514b30f06 -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: I7654c16cf3d03862a8c14767ba80d0621e5684fe
 2021-08-29 20:34:02 +00:00
Bill Yi
05320e232c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 3fb65a4774 -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: I617e4b8b03b02045bbda51b79e641593eee5f5e1
 2021-08-29 20:33:44 +00:00
Automerger Merge Worker
f0125f178a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 4a7694c598 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-29 20:32:33 +00:00
Bill Yi
c64842a1f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours am: 4a7694c598 -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: Ic6cc2eff4f54925bcbe4f3e23e981bdc2bf8e8c4
 2021-08-29 20:32:31 +00:00
Bill Yi
7b3a20b43d Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: I2587536f2eb8e7050555110ec969d8c9e5324f25
 2021-08-29 20:32:28 +00:00
Bill Yi
74f497939e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: 1a1eba9262 -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: I97c7379d45c961c40dc4fc479d926ce073016be4
 2021-08-29 20:32:27 +00:00
Bill Yi
8239b2a6a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours am: 1f17c42c16 -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: Id749548b969c6a12adc9dac11445681c779e76fb
 2021-08-29 20:31:05 +00:00
Bill Yi
4a7694c598 [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: I1ea6e2e3d955b85585ec6a9151964ed228408f63
 2021-08-29 20:30:11 +00:00
Bill Yi
9cc95ebe5b Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667

Change-Id: Ic5b3c88919a60f39260376003c5d7592f3ea9d18
 2021-08-29 20:29:52 +00:00
Bill Yi
da1bc4bff5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 am: df34345697 -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: Ib093788d253564ade3cd80e33a704e1158b81e8a
 2021-08-29 20:29:51 +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
91021b56dc Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Ie6e743cc3615104d55204925cf728dacb405cea4
 2021-08-29 20:28:34 +00:00
Bill Yi
d026c13fc6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: 30f4367fed -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: I588fea79f9a9b81a879a275459f075c76df712b4
 2021-08-29 20:28:28 +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
edc641b1bf Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678

Change-Id: Id20bf59d39993777389eea39b6d53be6f540cf8c
 2021-08-29 20:27:37 +00:00
Bill Yi
9a2e9009d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 am: a60710d90a -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: I02fa5d5853913144419d79e9cfc7fab2947ca5ff
 2021-08-29 20:27:36 +00:00
Bill Yi
1f17c42c16 [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: I676bc81dd2f0026702ac5cf128653338e9683502
 2021-08-29 20:27:25 +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