PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,115 Commits 1 Branch 0 Tags
bf29e9d39c5f25ef50bca3a4384037b640e63a0d
Commit Graph

123115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bdf1c0d0ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours am: 0fcfd96c98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e0c56cb75cfe4d8eda03fd36ebddd641ebe193b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:55:39 +00:00
Hao Dong
0703f48ea6 Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082

Change-Id: Ic19fe7709084759ae0637b6a1981a05e7dd97541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:55:20 +00:00
Hao Dong
8aae584706 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930

Change-Id: Ib890de88266fea8aeee3b17038b2f55979799cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:53:07 +00:00
Bill Yi
0bb31ed68b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours am: 8ea1c1ff59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7884f3efa5627b3ede5e36f15df5c31ca5742cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:34:18 +00:00
Bill Yi
d91a9e506a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54e56f9a7c86dde12ee71b7a89076927fdc60734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:28:24 +00:00
Bill Yi
0fcfd96c98 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1926d30af3c09df9c8393eea049c7a2a675a8e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:27:53 +00:00
Hao Dong
5a2ba07f63 Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev 2023-04-03 21:14:37 +00:00
Hao Dong
637ae9d983 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev 2023-04-03 21:06:40 +00:00
Bill Yi
8ea1c1ff59 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46acaf77116925dbb4e91aada4187ba3e362a742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:02:03 +00:00
Bill Yi
e63893afe7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03fe90cde312eb69915aa8b08b4a25924220d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:01:07 +00:00
Bill Yi
66ce27e9b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08d84eb6884581d359beff119b4d3f574805ebe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:01:06 +00:00
Bill Yi
d32bfe69d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibaffaac082919ddb7e00a3ba05ef0bb69cc9bfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:01:04 +00:00
Bill Yi
ebe838839b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88683fa7841083cfdfe8a711d88c29264b8e5edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 20:59:37 +00:00
Bill Yi
076cc4fc6c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I035cb268a83cfbdae6eca6c1c4b3f43306b5dc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 20:58:59 +00:00
Hao Dong
ee8252b56b Show a dialog preventing fingerprint enrollment in split mode. 
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132

Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
 2023-04-03 18:02:22 +00:00
Chaohui Wang
ecd8ffb08b Fix App battery usage crash 
userContext.getApplicationContext() returns null, which cause crash.

Use context instead to fix.

userContext was used to support multiple profiles, since the app's user
id is also passed to getAppBatteryUsageData(), userContext is not need.

Fix: 269545838
Fix: 275957358
Test: Manually check the battery usage is still correct if an app is
      installed on two profiles
Change-Id: I41a80e4c6edc338affb6eec0cf12da3c438cd7fd
 2023-04-04 00:15:29 +09:00
Bill Yi
eea2a19c9a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9a8f41aeff3f2d7585d46e1618449b06eec732ff
 2023-04-03 14:35:51 +00:00
Bill Yi
7d4a0514cf [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 
Blank merge reason: commit message contains skip directive

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

Change-Id: I11461a7dba648fbdd5a952aa6b1d2a2809058bc2
 2023-04-03 14:35:31 +00:00
Bill Yi
e29a9fb4ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d9f04335f9d38e35c8bebd63d32c2eddf7f5661
 2023-04-02 17:54:23 -07:00
Bill Yi
179fdda8d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
 2023-04-02 17:52:31 -07:00
Bill Yi
f44c0bafd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib25a02c4a90baad11c0f8febb39f677d38cddb78
 2023-04-02 17:50:19 -07:00
Bill Yi
92d09c8de3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib64f4f2df916279a9c06d6a718a46bbfde5750bf
 2023-04-02 17:48:09 -07:00
Bill Yi
4c6c727262 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie6806ae2768788dbef4a8dcff5f418970731ebb6
 2023-04-02 17:46:34 -07:00
Bill Yi
7a4e68d269 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieb9881a34662fb6c68038a3702b7e26907e25ef0
 2023-04-02 17:45:04 -07:00
Bill Yi
10dcb7b74a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26773573f3bd95ca50b4020ed338568b589771bb
 2023-04-02 16:52:48 -07:00
Bill Yi
09dbb8cd49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie4a6144a2775a690633f7cf183c71dce9eeb3365
 2023-04-02 16:51:26 -07:00
Bill Yi
baad0b1a23 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80aace7a5461f4c19ddeb31c0e4626dbeb69a12c
 2023-04-02 16:42:42 -07:00
Bill Yi
a125674f12 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I59062c543b7827661bd474ade118447546de979b
 2023-04-02 16:39:56 -07:00
Bill Yi
34efab58d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7bab6057f3a9ac9fba376e7731891a100aa97632
 2023-04-02 16:37:48 -07:00
Bill Yi
1b72d776ed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia76899f07cd7e4948adfc7d799e7bbacaf4c9310
 2023-04-02 16:36:25 -07:00
Bill Yi
16d455e59a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours am: 4040f0dc33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb8f47fd241fe95087f31578eb271b54922965b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:49:13 +00:00
Bill Yi
1b53838ef8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours am: 4038fae85a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I250c2cbef87df0118dfd8b6486a52e4a08ba059c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:49:05 +00:00
Bill Yi
5a2f468f71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours am: 2379404b47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia09e446981b707303d8897abecb2a3926956cd11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:48:46 +00:00
Bill Yi
d59fea6fca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours am: 25207a98ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97b7dab6c18e87c76de01770e4d2e8a655d0d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:48:23 +00:00
Bill Yi
4040f0dc33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc29247ba16c40f178f62e859ff05b259519fcf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:39 +00:00
Bill Yi
4038fae85a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b3b83e996d0298c1bf7c0d800ce04b9f2484b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:30 +00:00
Bill Yi
2379404b47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea2e6091924d2422ec9a9144142041799c47a12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:21:12 +00:00
Bill Yi
25207a98ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a621fb6a3a000bcf34229f6abc7808bee61fc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:20:51 +00:00
Bill Yi
506a9b317d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7357483d255938670c6ff10ebd22f72f76e6bf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:32 +00:00
Bill Yi
7555bb81d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39e92ab880ff65c6c2893df671cbc48fcec92028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:24 +00:00
Bill Yi
3c525dc4e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4af7b662cd2a8e5087376cbbd619efaf951ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:18:08 +00:00
Bill Yi
bdd7345e26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55532e33ae7ecf812d8cc54acbe9dbd3d94f40d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 19:17:41 +00:00
Bill Yi
c7918b9ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c078e0ceafb27e2c05505aa140a34909dea7f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:46:13 +00:00
Bill Yi
2309f00455 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b507ab323bccf47d2b145c5842a18809e312215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:46:03 +00:00
Bill Yi
2a19621591 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c878063b45fbbc1003be421c27c6b809db10051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:45:48 +00:00
Bill Yi
107129903a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica28fa658d4b2992a86850c9d126585cd18c9f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 18:45:21 +00:00
Bill Yi
a3af1db910 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 18:22:50 +00:00
Bill Yi
f884a037be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 18:22:50 +00:00
Angela Wang
25776de690 Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 am: 3e304f9e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070

Change-Id: Ie16d8f856509b5290ef6254074ded0126f947bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 07:01:28 +00:00
Angela Wang
3e304f9e1f Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070

Change-Id: I4ffcbfb99d718f96be27e93bcf6eb49ea4ebe7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-02 06:31:19 +00:00