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
Joe Bolinger
63786513fc Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev 2021-09-14 22:08:23 +00:00
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
YUKAI HUNG
bb9225ee74 Merge "Add package name into the metric for enable/disable app user actions" into sc-v2-dev am: 9fdeebf664 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15808964

Change-Id: I5996be56019260a9705c5059650a6232623eb570
 2021-09-14 06:43:29 +00:00
YUKAI HUNG
9fdeebf664 Merge "Add package name into the metric for enable/disable app user actions" into sc-v2-dev 2021-09-14 06:33:13 +00:00
ykhung
e12712dd1d Add package name into the metric for enable/disable app user actions 
add package name into the metric per @wangkelly request to analyze users behavior in the battery setting relative CUJ:
go/battery-setting-enums

Bug: 199807285
Test: make SettingsRoboTests
Change-Id: Ica6da59b933b0dcff940215d4e537a670bac52cb
 2021-09-14 05:02:29 +00:00
TreeHugger Robot
5be7a95a99 Merge "Correct how the injection mechanism starts activities" into sc-v2-dev am: 40e9a8aaaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809057

Change-Id: I8752904ce14c7ca84787e260b0bdb1a4aefb047c
 2021-09-14 04:14:22 +00:00
TreeHugger Robot
40e9a8aaaf Merge "Correct how the injection mechanism starts activities" into sc-v2-dev 2021-09-14 04:02:45 +00:00
Pavel Grafov
90659d877e Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: 6b3e240d20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: I724fa3d2c292b0420a629cb40ea03f36b22714b4
 2021-09-13 14:28:39 +00:00
Pavel Grafov
0e72224c38 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: fc67167c93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: Ic295385f6cb70c2caecff6679336dd757cde513b
 2021-09-13 14:18:44 +00:00
Pavel Grafov
6b3e240d20 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: Iaee401d8cc88e9c5a48d5fee445ae44980eacdd1
 2021-09-13 14:09:29 +00:00
Pavel Grafov
fc67167c93 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: I277765ca0a21a2793558668b3a3f20bccd2f28c4
 2021-09-13 14:08:56 +00:00
Pavel Grafov
1ecc3166f0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Neil Fuller
c90ae857d8 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779 am: 51f8f5e6ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: If5e9653f8d9cd80f76681e86ab008c17ca560cf1
 2021-09-13 11:45:30 +00:00
Neil Fuller
51f8f5e6ef Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I5e14da84bf0eb4d1db411b8ada82de2bbe5cfcb0
 2021-09-13 11:38:28 +00:00
Neil Fuller
4546286779 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I93dfc80658af894e720cec0a2c0e0489ee67c53e
 2021-09-13 11:30:54 +00:00
Neil Fuller
d2eca211d4 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I9be5d173953df0a90ee1309feceed35f9240c18c
 2021-09-13 11:17:50 +00:00
Neil Fuller
f6fe44dc91 Merge "Swap ownership to mingaleev@" 2021-09-13 11:03:08 +00:00
Pavel Grafov
36120b8a4c Respect PASSWORD_QUALITY_MANAGED for biometrics 
Bug: 195488124
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=\
    com.android.settings.password.ChooseLockGenericControllerTest
Test: manual with a modified TestDPC
Change-Id: Ifa15877c735bb0f396051af04a4e012a606bf9e1
 2021-09-13 11:50:06 +01:00
Bill Yi
4e07f0f267 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a1fbab88b0 -s ours am: 855f9e5125 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2db1ea9e58028f42b5a12f036ee01d3188665595
 2021-09-12 13:57:52 +00:00
Bill Yi
17fb9f308e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a1fbab88b0 -s ours am: c17d7563c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98cba29b3dcdfcb9cd9801edfc721e1e5fe6141b
 2021-09-12 13:57:41 +00:00
Automerger Merge Worker
e339aed968 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours am: 5b1fdf9c97 -s ours" into sc-v2-dev-plus-aosp 2021-09-12 13:57:38 +00:00
Bill Yi
055becd468 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours am: 5b1fdf9c97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If21d810f8c0064e72fba6548e171dbf42b28ff60
 2021-09-12 13:57:36 +00:00
Bill Yi
ba970e4598 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours am: 8ce118a210 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4551876069cbc6ecaed1e8330dcb3b5ad3040004
 2021-09-12 13:57:33 +00:00
Bill Yi
eef1d4e91f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: 7b59a40d17 -s ours am: b89b43bf79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If17759c4ed3524f950dca8cac2d81e4c7caa17be
 2021-09-12 13:57:28 +00:00
Bill Yi
6a322c0f51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: 080db6b64d -s ours am: 9f2415ea70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e0aaadf6fc4d7db4adb325069ca99d6ab2bf685
 2021-09-12 13:57:07 +00:00
Bill Yi
855f9e5125 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a1fbab88b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iceabb5681511ec764c6f6f2080016937ed70bc6a
 2021-09-12 13:43:25 +00:00
Bill Yi
c17d7563c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a1fbab88b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ac735c3a33e3064ac010f4c2c940f43ecabbebf
 2021-09-12 13:43:16 +00:00
Bill Yi
8ce118a210 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If16edc27fcafeedaebd585f7751c798c993b93b7
 2021-09-12 13:43:08 +00:00
Bill Yi
5b1fdf9c97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71dfd2c468ec965aa249177ad4d3cdb1ec2c3071
 2021-09-12 13:43:01 +00:00
Bill Yi
b89b43bf79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: 7b59a40d17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icaed89a976f212712af5fc73c8256e03c04cccb2
 2021-09-12 13:42:54 +00:00
Bill Yi
9f2415ea70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: 080db6b64d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I755e18813630f8815577e5a3f58af411077ce546
 2021-09-12 13:42:43 +00:00
Bill Yi
520f4ee356 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: 84c8cce97e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cbbad398a9fdd902376581cf356177574510675
 2021-09-12 13:29:04 +00:00
Bill Yi
a1fbab88b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2524cd8a07d10ec1cdf4aac42e972caa9e6a90f4
 2021-09-12 13:28:23 +00:00
Bill Yi
98cacdb937 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: d056c27aef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b6e42d5604ce0c29bd45b81f74f337b5535c7ec
 2021-09-12 13:28:19 +00:00
Bill Yi
a6262f4929 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf908ae1613110202f6bfa0ed16f575866121fb4
 2021-09-12 13:28:15 +00:00
Bill Yi
038e153f01 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: 78d0880792 -s ours am: 1c9390c614 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b6c3ac4edd682dffd6a745ea0bd22e54d035fbb
 2021-09-12 13:27:30 +00:00
Bill Yi
7b59a40d17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib76fa3621571832716728f486aafc0d01b6e6a60
 2021-09-12 13:27:23 +00:00
Bill Yi
080db6b64d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3dfaff3154b221dc5c5e46c8434fefcb735bec2
 2021-09-12 13:27:16 +00:00
Bill Yi
84c8cce97e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18e0855054dd67edc6985c6fdc12b122fbee5944
 2021-09-12 13:13:18 +00:00
Bill Yi
86cacf70aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: fcfda43bea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If14266ebb0c61d1c36aec8cc079ef53df1ee9cde
 2021-09-12 13:13:02 +00:00
Bill Yi
fcfda43bea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9896ddd961fae69c3cfbe0e0cda3e4f7145a9956
 2021-09-12 13:12:37 +00:00
Bill Yi
d056c27aef [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34b94c1b42a6f0dbacc5b0e8b13866d5cab656b0
 2021-09-12 13:12:09 +00:00
Bill Yi
7cd88a6fbd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: e7b71e21f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52eb57154fe1c959d45dcd0b8d4b863c3ec4faa2
 2021-09-12 13:12:04 +00:00
Bill Yi
e7b71e21f7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3cdc138f8fca9a1ce62c5f6fdb5c6d4e92b05fa
 2021-09-12 13:11:39 +00:00
Bill Yi
75d96641c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieff57a9bcb1cb08bfff67c882d2d23d40bf8881c
 2021-09-12 13:11:17 +00:00
Bill Yi
2bc492b5a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c98246752b54a166967392171d412f79fa3dfce
 2021-09-12 13:11:08 +00:00
Bill Yi
cbe48c99a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7f61b4eb74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice32a072a0d7584adb342031e2fc426c07f4e9e4
 2021-09-12 13:11:08 +00:00
Bill Yi
1c9390c614 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: 78d0880792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie370a49faa9729372de252a89a8cf3d5bb5cb2f2
 2021-09-12 13:11:04 +00:00
Bill Yi
7f61b4eb74 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-12 13:00:06 +00:00
Bill Yi
0444a1a047 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-12 12:59:03 +00:00