PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,038 Commits 1 Branch 0 Tags
83ce10847fa4bb722b32e73e1cea63acac0286db
Commit Graph

95038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
83ce10847f Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc am: 3452769f1e am: 184e77a8d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: Ic7cae7f02aaaa7e36222a0b4bbad9ae0a67fbe01
 2021-09-14 23:43:26 +00:00
Joe Bolinger
184e77a8d5 Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc am: 3452769f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I4e798fbebf3266b970fcb3d94c2390833541ba9d
 2021-09-14 23:28:11 +00:00
Joe Bolinger
3452769f1e Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I3dbb1da09fe9ea625b37cce6ae85262893900e30
 2021-09-14 22:23:25 +00:00
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
Bonian Chen
fbcc413bfa Merge "[Settings] Avoid from crash - SystemProp default null" 2021-09-14 13:01:48 +00:00
YUKAI HUNG
1360bec88a Merge "Add package name into the metric for enable/disable app user actions" into sc-v2-dev am: 9fdeebf664 am: bb9225ee74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15808964

Change-Id: Ib738a56aa262fc4a93aaa6bf4841f4a45ecda0eb
 2021-09-14 06:59:34 +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
Bill Yi
c1e65d38ad Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-14 05:47:31 +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
d604c56542 Merge "Correct how the injection mechanism starts activities" into sc-v2-dev am: 40e9a8aaaf am: 5be7a95a99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809057

Change-Id: Ib6b6c20b95653e23e79183e8ec30ac6a7c462d0d
 2021-09-14 04:23:42 +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
Bill Yi
78d8baf063 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If0d6de48010e1fe4d8be90330226954d4e523fb9
 2021-09-13 16:39:18 -07:00
Pavel Grafov
3c7843be0f Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: 6b3e240d20 am: 90659d877e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

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

Change-Id: I44c3cbd651e59cc195a25f5ce06c4ea5b4fa441e
 2021-09-13 14:33:14 +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
c6dfa37e21 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779 am: 51f8f5e6ef am: c90ae857d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I694714e4c6354108e971f6c30828645e0240ef54
 2021-09-13 11:58:22 +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
875126cb2f [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: 4e07f0f267 -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: Ic0747dbe80025f75f3b7980a9e9d8c977ad84683
 2021-09-12 14:08:35 +00:00
Bill Yi
fec4bef2cb [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: 17fb9f308e -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: Ibab6c1fcb48338ba0abcd82a4625cdc0388aa0f4
 2021-09-12 14:08:29 +00:00
Automerger Merge Worker
d2d55d6c2e 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 am: e339aed968 -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: I8c406b241a8794dc2cfb73f03d94683bc1ad0131
 2021-09-12 14:08:24 +00:00
Bill Yi
f6eea5730c [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: ba970e4598 -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: Ief265a58ee7f32656dfc3d02d6d56f497877133d
 2021-09-12 14:08:00 +00:00
Bill Yi
e8aeeded0c [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: eef1d4e91f -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: Id4bdeda62659bb37a565c15bd5e582ae5da2ee60
 2021-09-12 14:07:34 +00:00
Bill Yi
8dca0223ac [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: 6a322c0f51 -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: I5a1b727e214b2db3be19e6e7af309018518a87de
 2021-09-12 14:07:04 +00: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
1802ef9f1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a9a3180777 -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: Id3e89fe3acde7d089b36950e30b3081c36f3d1ba
 2021-09-12 13:42:19 +00:00
Bill Yi
8130142396 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: 25884c44b1 -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: Ia1630d9920b1724c69b50328892eb4cf0ad06e3e
 2021-09-12 13:42:14 +00:00