PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,403 Commits 1 Branch 0 Tags
f2bc394a029a8c91de8d859b415ef93cfeceff8a
Commit Graph

114403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
f2bc394a02 [automerger skipped] Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e427 am: 6992c28b4a -s ours 
am skip reason: Merged-In I9142c0d4e00dea3771777ba9aedeab07b635fa1a with SHA-1 284e049cc1 is already in history

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

Change-Id: I22c590e6cd29aec418f9f5d9f2e0cde1759339e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 02:17:43 +00:00
YK Hung
6992c28b4a Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569019

Change-Id: I69ba753143ff1bb5fab2db8a53785540530e3c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 01:50:45 +00:00
YK Hung
c586e1e427 Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev 2022-08-19 01:30:51 +00:00
Joshua Mccloskey
8793da4a56 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93 am: 4006c7e9e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: Iac0e30237c3b8d0490c94a77f2f18b53fe846bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 01:15:21 +00:00
Joshua Mccloskey
4006c7e9e8 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: I70ee59c235d23d1de53ca3eebba4c34e847d332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 00:55:10 +00:00
Joshua Mccloskey
b87ada7c93 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev 2022-08-19 00:37:16 +00:00
TreeHugger Robot
b23643cd51 [automerger skipped] Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev am: e48008d287 -s ours am: 79eeb70843 -s ours 
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

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

Change-Id: I82177d588cdc09906d6eba7e7cecc378d5b2dfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:05:49 +00:00
Weng Su
50d77b8c75 [automerger skipped] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: dc4ad09291 -s ours am: e76784f08c -s ours 
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

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

Change-Id: Ia17ae2dc0abaf9920dd563560c45daa915dcb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:05:45 +00:00
TreeHugger Robot
79eeb70843 [automerger skipped] Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev am: e48008d287 -s ours 
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

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

Change-Id: I6adf2ec2e277abc1c4bdb61fae99654dbe807603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 20:46:53 +00:00
Weng Su
e76784f08c [automerger skipped] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: dc4ad09291 -s ours 
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

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

Change-Id: I46b761771bd105053cb9b3683d59893911224215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 20:46:48 +00:00
TreeHugger Robot
e48008d287 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev 2022-08-18 20:30:20 +00:00
Joshua McCloskey
739ca9cc97 Added basic SecuritySettingsPref test 
Test: atest SecuritySettingsTest
Bug: 234309000
Change-Id: I0d54ff17601ed6646c92472f03990a1dd3e4dc4d
 2022-08-18 17:36:36 +00:00
Kuan Wang
4db5c6ba57 Port new version battery usage chart implementation from master to tm-qpr-dev. 
This cl is a merge of the following 36 cls:
ag/19250259	Duplicate BatteryChartPreferenceController and BatteryChartView into new files for better diff review purpose
ag/19279660	Use Mockito 4.6.1 API for BatteryChartPreferenceControllerV2Test
ag/19267975	Add class BatteryLevelData used to parcel the battery timestamps and levels. It behaves as an interface between UI and data.
ag/19289086	Refactor BatteryChartView X-axis labels. Instead of only timestamps, also support any string[] labels.
ag/19238586	Add interpolation for the history data since last full charge loaded from database.
ag/19331746	Return raw history map in function getHistoryMapSinceLastFullCharge.
ag/19308838	In BatteryChartViewV2, use levels.length-1 to replace mTrapezoidCount. So the chartview could show any number of slots as the given levels length-1.
ag/19332266	Add class BatteryDiffData used to parcel battery usage data
ag/19331467	Refactor Battery Chart View State Controll
ag/19358207	Add DataProcessor to process raw history map for UI.
ag/19332276	Add battery chart view model.
ag/19394744	Update trapezoid validation in battery chart view.
ag/19379730	Support daily and hourly battery chartview.
ag/19428426	Improve X axis labels in battery chart (1)
ag/19446215	Improve X axis labels in battery chart (2)
ag/19394745	Add the async task to compute diff usage data and load labels and icons.
ag/19447624	Support showing app usage list for two battery charts
ag/19500907	Updates battery usage messages from last 24hr to last full charge. (Part1: V2 files)
ag/19505324	Update the selected period message in battery chart
ag/19500905	Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)
ag/19510363	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19523184	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19534864	Add margin between battery daily and hourly charts
ag/19491093	Always do interpolation for battery level data in daily chart.
ag/19565630	Avoid NullPointerException when batteryLevelData is null.
ag/19561239	Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back
ag/19565633	Fix b/241885070: Unexpected texts moving when going back to battery usage page
ag/19534850	New way to draw battery chart axis labels
ag/19561240	Switch Battery Usage Chart from V1 to V2.
ag/19561338	Switch Battery Usage Chart from V1 to V2.
ag/19600174	Fix b/242254055 Battery usage initial screen improvements (long data loading time)
ag/19600284	Fix b/242252080: Add padding space on the top of the battery chart
ag/19647338	Consider usage map valid even if [all][all] is null.
ag/19634227	Use new content uri everytime to avoid cache
ag/19600177	Fix b/242009481: Refine the battery usage chart timestamp label rule
ag/19647337	Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case.

Test: manual
Bug: 239491373
Bug: 236101166
Bug: 236101687
Fix: 236101166
Change-Id: I7de8d9dcee14627da10752534991f1ec9f616020
Merged-In: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
 2022-08-18 10:53:41 +08:00
Treehugger Robot
48b4af999a Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 am: ac7a368afd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I0ebc25250b00a36bef5a72dd87192013b08e098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:53:49 +00:00
Treehugger Robot
ac7a368afd Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I9c4c43088154202d5818b29d010f053a7630ec90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:29:36 +00:00
TreeHugger Robot
aa21979d79 Merge "Fix b/242009481: Refine the battery usage chart timestamp label rule" 2022-08-17 20:27:55 +00:00
Treehugger Robot
49a0bbc650 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I1ce70edf6d735df8340f4ec483dbe3fc4df7b897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:11:01 +00:00
Tsung-Mao Fang
9c826fe1f7 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours am: a2172abb33 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ia941a9dec4fab948352e4642fd8a7e44c6ebe4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:15 +00:00
Tsung-Mao Fang
4346c1edeb [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours am: d71843cb7a -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ia555ddb9ba1a75356012de36d4caddc83ca83122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:06 +00:00
Tsung-Mao Fang
68e5a2fc39 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours am: 2ecdc63708 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I05d9101fbd11f27a04a8dfaa54bad9f1fbce39d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:45:42 +00:00
Treehugger Robot
cdacabf984 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:44:42 +00:00
Tsung-Mao Fang
a2172abb33 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I3def89776e44038f96c7ba7e9bcabaa81a2cd31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:26:25 +00:00
Tsung-Mao Fang
d71843cb7a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iab55b2c0976dae5e333ffdcebeddcc65ac536696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:26:03 +00:00
Treehugger Robot
a89e7aea3b Merge "Fix array-related errorprone warnings" am: a93e78f781 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I644d5974c31a216b360a2dc1d1b1c156f6288f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:27 +00:00
Tsung-Mao Fang
2ecdc63708 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iec82fac54be6f461bc8754b46a08636814a8e899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:24:59 +00:00
TreeHugger Robot
2bc09010d8 Merge "Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case." 2022-08-17 19:01:27 +00:00
Tsung-Mao Fang
662e5722b3 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I9075895f07ea2a3bf74ab70aab62439ab19244ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:49:20 +00:00
Tsung-Mao Fang
a27edf0a5a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I0c6902c38a253d0c1a17211355b75419abcc6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:47:42 +00:00
TreeHugger Robot
8da2082885 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours am: e671474e54 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Iad8f7328b28626ce01095e4fe6a4f0ce8274a265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:36 +00:00
TreeHugger Robot
c09a147e2c [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours am: a1e365891f -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I7d0fbdf32c82bdb5981b811c1a8ba4e438fcb918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:27 +00:00
Tsung-Mao Fang
a1a3fdc095 [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours am: 39f5e29a4e -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Idde9870d03c465557a36b851d73857e2d1c7d57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:42:25 +00:00
Tsung-Mao Fang
fed58ddcd0 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ic55a9d1f05cb6c0fb2a84626d596983ef3f0ba34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:40:29 +00:00
Tsung-Mao Fang
5a1743ecba [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 36d1a62382 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Ica25f8d7c3fd0c7c11ec91dde7c47ee80d021dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:39:53 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
TreeHugger Robot
e671474e54 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ib1cde7a72e43ef82db43b15e2d029857b4f0e18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:29 +00:00
TreeHugger Robot
a1e365891f [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I9dc41d0c0081fc1a6f5fc7f9e8681bb8ce2dc555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:04 +00:00
Tsung-Mao Fang
39f5e29a4e [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I201879780c8ae74b917f0d0b9f6d1f8efca3dc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:01 +00:00
Tsung-Mao Fang
4e53971f19 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:11:47 +00:00
Tsung-Mao Fang
36d1a62382 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I24f7695ab202389ab092bb242e395e2a89f59532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:50 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:31 +00:00
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:32 +00:00
TreeHugger Robot
84935ceab8 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Ie074b5d8865a251480f7e8d116542296e5253be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:13 +00:00
Tsung-Mao Fang
fa5900b6ba [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I2fe3c73254c35c778191cf8899fccf48dcab7a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:08 +00:00
TreeHugger Robot
75ee88eaa0 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev 2022-08-17 17:16:52 +00:00
Robert Luo
2dcc5e154b [automerger skipped] Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131 am: c6d8ef82c4 -s ours 
am skip reason: Merged-In Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f with SHA-1 061a87fe1f is already in history

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

Change-Id: I8b3040f4bc83b7055431c07d1305f1a9519c9cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:38:43 +00:00
Jason Hsu
6a0fd169fe Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870 am: cd76ba8821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Ic1bc7a3ef9f13437592088642411cb031b87004e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:06:51 +00:00
TreeHugger Robot
86f436dd0d Merge "Consider usage map valid even if [all][all] is null." 2022-08-17 14:43:48 +00:00
Zaiyue Xue
e716055e45 Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case. 
Bug: 242809981
Fix: 242809981
Test: manual
Change-Id: I303bbc2679f70ef16636c28f6364381f49457387
 2022-08-17 12:59:50 +00:00
Kuan Wang
508d938bc8 Consider usage map valid even if [all][all] is null. 
Bug: 242835128
Fix: 242835128
Test: manual
Change-Id: Icd8e157f08d741604b5769464d74660651eb69df
 2022-08-17 19:18:16 +08:00
Zaiyue Xue
b4fe32640f Fix b/242009481: Refine the battery usage chart timestamp label rule 
Draw the first and the last labels. Then recursively draws axis labels between the start index and the end index. If the inner number can be exactly divided into 2 parts, check and draw the middle index label and then recursively draw the 2 parts. Otherwise, divide into 3 parts. Check and draw the middle two labels and then recursively draw the 3 parts. If there are any overlaps, skip drawing and go back to the uplevel of the recursion.

screenshots: https://drive.google.com/drive/folders/11AJ4Fz6xS76LGlbAy9WfvjZpffgFkMji?resourcekey=0-HBWCQa1oQW4e0UfvLzEXGQ&usp=sharing

Bug: 242009481
Fix: 242009481
Test: manual
Change-Id: Iaa9019feba7693638d5ae64bbbee7298eb74f749
 2022-08-17 08:50:54 +00:00