Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,957 Commits 1 Branch 0 Tags
2ecddcaf9fd0f8a32067b0a918e4ea6d06937c51
Commit Graph

118957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
2ecddcaf9f [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours am: 140bcebdb2 -s ours am: ef9b1c5a55 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I45436a01578d80777d770e416b60355a77d9e1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:21:07 +00:00
Yanting Yang
9665f09929 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours am: 3e8931d5b0 -s ours am: 17fe8736eb -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Id2a7117d7c962363a08ad8b38f95e4d508d59ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 05:20:39 +00:00
Yanting Yang
ef9b1c5a55 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours am: 140bcebdb2 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Id1e4f03de3c6d87e99d9d5b65c8c067b915abb66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:47:26 +00:00
Yanting Yang
17fe8736eb [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours am: 3e8931d5b0 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Ic6ca08a3b3643e4820319954b429e22b5986a8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:47:16 +00:00
Yanting Yang
140bcebdb2 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours am: accde42e7d -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I05d44ca0d4aae5afcbcf7b81172db4f65239f1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:51 +00:00
Yanting Yang
3e8931d5b0 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours am: 615f13120c -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: Ie91293bee1f3f096f5599b0c43fc5f8bd0c2551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:45 +00:00
Yanting Yang
579da68f9a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours am: a262c1f821 -s ours am: abfd6640f7 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: Id18893af5f1d795717f91fee21de1cda3972b903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 04:15:37 +00:00
Yanting Yang
accde42e7d [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours am: 3fefcb236a -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I6dc5bcd9b40c5f565ec370ca99cea68a5d4ea528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:31 +00:00
Yanting Yang
615f13120c [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours am: 33186e2f03 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I98957aa0f4c8108d6cad7b3beb4bef5a47821a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:43:26 +00:00
Yanting Yang
abfd6640f7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours am: a262c1f821 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: I82653afb955c201451a6262c0afb2390d3cb29d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:40:49 +00:00
Yanting Yang
3fefcb236a [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours am: f54f57f1a7 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: Ieac19e01cf73c5861992714c7602e4c88ea87c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:23:31 +00:00
TreeHugger Robot
d6905dd6ce Merge "[Battery usage U] [UI] Show total "Screen On Time" in the battery usage page" 2023-01-07 03:22:46 +00:00
TreeHugger Robot
95497baf4e Merge "Fix the inverted logic to judge whether an app is system app." 2023-01-07 03:20:08 +00:00
Yanting Yang
8b91e2b218 [automerger skipped] Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46 am: 2ab25b8b96 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 18e77f27aa is already in history

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

Change-Id: I76dddb9ab8dd069752c6db977b79c658ad77b6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:12:03 +00:00
Yanting Yang
f54f57f1a7 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 0616b484e9 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 9191ec13e2 is already in history

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

Change-Id: I3ee17f055872b9ad8929c3a07f70a12646040939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:10:14 +00:00
Yanting Yang
a262c1f821 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe am: 5dbaf208f0 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 f3b323e378 is already in history

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

Change-Id: Idb0ba09a9aab296d27698c29c04c976332331925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:10:08 +00:00
Yanting Yang
33186e2f03 [automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 9191ec13e2 -s ours 
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 22e4eebafe is already in history

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

Change-Id: I45654cc46309d8051f06a0b6082d38a04e612196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 03:06:36 +00:00
Yanting Yang
5dbaf208f0 Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 22e4eebafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871702

Change-Id: Ic9875331fa1a63feee2d51c4782e8c98df882794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 02:34:52 +00:00
Yanting Yang
2ab25b8b96 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682

Change-Id: I884e3ce1ba968181da190fbf2ec1196f4894c4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 02:32:19 +00:00
Yanting Yang
f43feb6a46 Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev 2023-01-07 01:56:05 +00:00
TreeHugger Robot
f730f899d8 Merge "Add Extra Exception Checks to Null Cipher Toggle" 2023-01-06 21:49:22 +00:00
Becca Hughes
c84d77cdf5 Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64 am: da53b2912c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I645c29b608373dcb31f8dc183da7b220d6bb46c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:58:24 +00:00
Bill Yi
275c53dc15 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours am: c768c92641 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ecf30fabfec9a056f80eb07443ab1879d5e410a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:49:00 +00:00
Bill Yi
be438c6332 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours am: d00c17ec81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bd783c7da4583d3fe5d99c204c82b82d3c3613f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:48:16 +00:00
Becca Hughes
da53b2912c Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:28:41 +00:00
Bill Yi
c768c92641 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours am: 8f67dfd0c6 -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: If86bfe3c232a6fab682b6dad9fb4dd2f0a7a9d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:27:07 +00:00
Bill Yi
d00c17ec81 [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours am: 9be6f23a0c -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I8499b724c8500edf9129a1f612b97f756defd1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:26:04 +00:00
Becca Hughes
5b7dc67d64 Merge "Add credential manager team to OWNERS" am: ce5d029670 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251

Change-Id: If599c23c05ab5eaf4a80a4b3a4acd0f3c6f78cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:05:01 +00:00
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
8f67dfd0c6 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2e7924abcf -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I3051eb6db0fcb1e3ac1e2300f18461a297f789b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:49 +00:00
Bill Yi
9be6f23a0c [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 1883efae0a -s ours 
am skip reason: Merged-In I11c236f3901c9faaeb6c702678d330dde8f07f38 with SHA-1 ce2edfa3d4 is already in history

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

Change-Id: I07d24876a3be08444cb4660b280565679cb5ab04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 20:00:02 +00:00
Bill Yi
2e7924abcf Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Gil Cukierman
58f946072d Add Extra Exception Checks to Null Cipher Toggle 
Adds broad exception safety to all TelephonyManager calls.
Without these extra catch blocks, the entire Settings app would
crash if a TelephonyManager API were to throw an exception.

Bug: 262914591
Test: atest NullAlgorithmsPreferenceControllerTest
Change-Id: I997a37fe71bf007d67989c89b3abe3e520d79d3c
 2023-01-06 19:30:26 +00:00
Bill Yi
238b7b4620 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours am: 2d50872f81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b8199044ea7bc30cc71ceba55113c551b06c972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 19:05:06 +00:00
Bill Yi
d227fbe832 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-06 18:37:48 +00:00
Bill Yi
2d50872f81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2681d8cc05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic705dd2a80e2a322142e1e91afa80ef0f00c0383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 18:30:40 +00:00
Bill Yi
1883efae0a Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE 
Merged-In: I11c236f3901c9faaeb6c702678d330dde8f07f38
Merged-In: I3d784788884f9b80733786dc73d9bb62ffef817b

Change-Id: Iabf5075f225933cd03d2d2ac43b9821ecc9fb7c1
 2023-01-06 15:26:15 +00:00
Bill Yi
7b9bce321b [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37 -s ours am: 916adf4270 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f49f80829644f1760aa70cf47e91beb927304cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 12:10:36 +00:00
Bill Yi
75297a152a [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951 -s ours am: 5f3ffc5ec6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bbce98aff2d31eb9cf7a19f73790c877c11e916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 12:10:08 +00:00
TreeHugger Robot
7c1efa29cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a0d84081e2 -s ours am: c1ce13f040 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic69e4ac289cc3df6e1072770ee5f3ad95ae85097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:52 +00:00
Bill Yi
68a8c8d2c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38268df283 -s ours am: d53751548b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If72f0f7e9f6eb8f33c839d64d5e8c54f01741ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:37 +00:00
TreeHugger Robot
024dc88ddc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 80404721aa -s ours am: 5291d0476f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e664557a9968208aa6c36ff466a0999737f8f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:22 +00:00
Bill Yi
cec23edebe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6480a5ff9c -s ours am: 53f80eb54a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab17c32c513b94691cf22b2d06d812f3058b903d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:39:18 +00:00
Grace Cheng
fb77440a6f Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d am: 305fbd98db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930

Change-Id: Ia3ffc6fadcec112adc45265bb6953881a9b02ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 11:36:09 +00:00
Vania Januar
0bcac61001 Merge "Intent to open USI device details page." 2023-01-06 11:30:53 +00:00
Zaiyue Xue
833e47d851 [Battery usage U] [UI] Show total "Screen On Time" in the battery usage page 
Screen record: https://drive.google.com/open?id=16ZOp1E2YBzWQXbnXl786FaLFPel-S9CF&authuser=0&resourcekey=0-oRqCrdTc9FZjVgsq9orhEw&usp=drive_link
For Arabic: https://drive.google.com/open?id=1zh_4jcUnqLC6CDgwju1qQkWJ0QCtm19c&authuser=0&resourcekey=0-kuKfDdOTWxqOUmD0RfPNLQ&usp=drive_link

Next step: show screen on time for each app

Bug: 258120710
Test: manual
Change-Id: I2085a2a85ebd50b2ac876972f6a8ebbf6f20246c
 2023-01-06 19:09:52 +08:00
Bill Yi
916adf4270 [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 182c397d37 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: I083e54e24f3894ef3d798bfafce6aa0b221091b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:33:21 +00:00
Bill Yi
5f3ffc5ec6 [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: c286104951 -s ours 
am skip reason: Merged-In I77029014d72b8ac9b579357550f031bef20e32cb with SHA-1 8e2f0b970b is already in history

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

Change-Id: Ia8ed6202af921e0e4e4e175da868c7a7ef03fa10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:32:54 +00:00
Zaiyue Xue
814eff1c24 Fix the inverted logic to judge whether an app is system app. 
Bug: 264626206
Fix: 264626206
Test: maunal
Change-Id: I3750e3b11e444add27243c492cf8968373cd57d0
 2023-01-06 15:24:44 +08:00
Bill Yi
182c397d37 Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2023-01-06 07:00:53 +00:00