Michael Wright
bbde399410
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797
Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 16:05:15 +00:00
Michael Wright
1218065085
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev
2022-08-24 15:24:15 +00:00
Lucas Silva
1eeae5a623
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464
Change-Id: Iaf38d68d9a2c03c2612ae17fec3094bc41087edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 14:16:59 +00:00
Lucas Silva
225b3b0640
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev
2022-08-24 13:54:16 +00:00
Michael Wright
475632c4fe
Revert^3 "Improve App notification loading"
...
33710fd9e2
Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
2022-08-24 12:22:12 +00:00
Bonian Chen
80e17e97f3
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I0ce4c4789f2e839ab92b71a8b517cc2680e49c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 07:03:40 +00:00
Bonian Chen
6920c9e7ce
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev
2022-08-24 06:38:58 +00:00
Wesley Wang
20e927164b
Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293
Change-Id: I50b0b62fd268026ac0e79a14df8640f19be5078f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:02:02 +00:00
YK Hung
7e9c49305f
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev am: 821c5702cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19707329
Change-Id: I2f0a4c8b200f69d37d16577ee1131efe2eaba248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:01:54 +00:00
TreeHugger Robot
3588b515f2
Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303
Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:01:14 +00:00
Wesley Wang
a0c76c92a1
Merge "Update extra defend layout string" into tm-qpr-dev
2022-08-24 05:11:03 +00:00
YK Hung
821c5702cd
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev
2022-08-24 05:08:48 +00:00
TreeHugger Robot
adf79eae3e
Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev
2022-08-24 05:04:05 +00:00
Betty Chang
3852ceab9b
Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826
Change-Id: I7a4f1366a1481e303afe73f21320cd3c421015e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 03:51:23 +00:00
Betty Chang
f14071682f
Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev
2022-08-24 02:55:13 +00:00
Bonian Chen
534dbdfd29
Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214
Change-Id: Ib5200b5c3a0cbf87fc8a8de5991742847b924049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 20:50:09 +00:00
Sayak Dutta
3985485b3a
Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19682757
Change-Id: Iae792a3cb815612047ffb2c14fee3c40a19653d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 20:22:51 +00:00
Bonian Chen
9bdca3ba92
[Settings] Data warning & limit UI should be configuable when running out of limit
...
Should access API which is irrelated to status of data limit.
Changing from API isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
into isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER).
Bug: 223361190
Change-Id: Iada89de38e9db3706a944c7a5b5f8a3e87d415e5
Test: Manual
(cherry picked from commit 7e530dda39 )
2022-08-23 18:37:08 +00:00
Treehugger Robot
cb302284e6
Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d am: 1467de15bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: Ie73421bb80637e58b04772e20289a38d22a2a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:35:06 +00:00
Treehugger Robot
1467de15bc
Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: I6ffe3f49c01d692a9eb1c77030be732be204ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:17:42 +00:00
Treehugger Robot
4c06c2426d
Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 13:59:51 +00:00
Treehugger Robot
d221269892
Merge "Fix always return first package for mock location app in developer options."
2022-08-23 13:15:51 +00:00
Pajace Chen
b00140b7a3
Reduce the calling times for isExtraDefend
...
Only calling this HAL API when BatteryDefenderTips card need to be shown
Bug: 243465597
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Iae3c03d946ec29fe78a826ce62b6bebd893704ef
2022-08-23 20:15:50 +08:00
Zaiyue Xue
2a57f5de8d
Port battery usage bug fixing cls from master to tm-qpr-dev
...
This cl is a merge of the following 5 cls:
ag/19674112 Fix b/242989581: The two battery charts have the same label
ag/19667114 Support data logging for battery usage new chart view
ag/19636171 Support data logging for battery usage new chart view
ag/19682758 Resolve insufficient contrast for system component icons
ag/19697763 Add fade in animation for battery usage chart group
Bug: 242989581
Bug: 242810430
Bug: 242989982
Test: presubmit
Change-Id: I39cd0f88ce62a280a966750082a40f8a537b9616
Merged-In: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-23 19:30:49 +08:00
张倞诚
d8d0cb3532
Fix always return first package for mock location app in developer options.
...
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.
Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
2022-08-23 07:50:16 +00:00
Bonian Chen
188ccde75b
[Settings] Additional route for dismiss activity dialog
...
Previous design dismiss an activity dialog through Intent would lead to a pair of creating and finishing activity. The task switch during the creating and finishing may introduce some side effect to the other apps.
This change tried to add additional route to avoid from dismiss through Intent
but sending an async close request to that specific dialog (if available).
Bug: 236956105
Test: local, auto testing
Change-Id: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
2022-08-23 06:13:46 +00:00
Sayak Dutta
af11c676a9
Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev
2022-08-23 05:45:03 +00:00
changbetty
c918fa812b
[LE Audio] Display the correct title on broadcast assistant device
...
Bug: 241509690
Test: manual test
Change-Id: Iaf3a54108faaa82354ca30656dd4b7a384806408
2022-08-23 03:01:42 +00:00
Diya Bera
0b34834c92
Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd23e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19645603
Change-Id: I1ad6fb329ecfdcffcecd8bb80b6d300b7bc9e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 22:17:53 +00:00
Diya Bera
02ca9bd23e
Merge "Removed redundant face unlock option." into tm-qpr-dev
2022-08-22 21:57:44 +00:00
Joe Bolinger
d3b4bf7e03
Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d965
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253
Change-Id: I668ff41be6cda1b42c8815eb5ad382ab4757e763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 21:22:40 +00:00
Joe Bolinger
aeb042d965
Merge "Cache context for generateChallenge response." into tm-qpr-dev
2022-08-22 21:04:40 +00:00
Lucas Silva
059154ebb2
Update dream complication settings to use boolean setting.
...
This simplifies the logic and prevents the boolean from toggling itself
when new complication types are added.
Bug: 241469874
Test: manually on device
Change-Id: I0b67f9f2ce75dcfc5e57a50f9b27e374ea9295b1
2022-08-22 16:22:53 -04:00
Michael Mikhail
d06eaf6f43
Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762
Change-Id: I9bfdf646fb6191e201ce014b610cf612c037443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:04:04 +00:00
Michael Mikhail
c77ab55735
Merge "Add media on lock screen setting" into tm-qpr-dev
2022-08-22 14:46:06 +00:00
Julia Reynolds
e8409ecf10
Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473
Change-Id: I85fd316de253f7d3879962e74aece04db0f3f0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:18:35 +00:00
Julia Reynolds
635b3f065e
Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev
2022-08-22 13:56:41 +00:00
wesleycwwang
27cbd5bccd
Update extra defend layout string
...
Bug: 235246949
Test: make RunSettingsRoboTests
Change-Id: I3a3afe2e47d90882bdc4e4180ea5c6b079efd828
2022-08-22 18:51:45 +08:00
Sayak Dutta
05b7cb0225
Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917
Change-Id: I589676bfca185db1bbefbe804e9512b72142676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 06:33:54 +00:00
sayakiitg
9521748a77
Update back FooterButton visibility for navigation instead of back button
...
Bug: 201252175
Change-Id: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
(cherry picked from commit 40e436ff3b ).
Merged-In: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
2022-08-22 06:31:38 +00:00
Sayak Dutta
e66ae3f9db
Merge "Revamp SD card UX" into tm-qpr-dev
2022-08-22 06:13:30 +00:00
sayakiitg
efdedcdc15
Revamp SD card UX
...
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.
Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png
Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531
Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
(cherry picked from commit 9b432d54a6 )
Merged-In: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-08-19 19:07:40 +00:00
TreeHugger Robot
bd13405d8e
Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev am: 4a0bc2c34b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600285
Change-Id: I81eb13d2c651d25accc69f68afb634882daeca9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 14:39:14 +00:00
TreeHugger Robot
4a0bc2c34b
Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev
2022-08-19 14:22:11 +00:00
YK Hung
939f2a9eed
Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa3262857c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19633714
Change-Id: I691685d2190e03c917e9cee6ef9dc94a94e97f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 03:04:12 +00:00
YK Hung
aa3262857c
Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev
2022-08-19 02:43:57 +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
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
Michael Mikhail
56e5b3da96
Add media on lock screen setting
...
Add a new setting that controls whether media on lock screen is enabled,
disregarding the notifications status. The new setting is available
under media and privacy settings.
Bug: 229915240
Test: atest MediaControlsLockScreenPreferenceControllerTest
Change-Id: I054f36efd635dc0535551d3058f9faf92196349d
2022-08-18 11:57:13 +00:00