YK Hung
c4801433d9
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev
2022-04-15 13:06:04 +00:00
ykhung
1c6695951f
Use the custom name in the battery attribution if it is unknown item
...
Keep the queried name is null to use the custom provided battery attribution name (avoid to replace it with POWER_COMPONENT_ prefix name), such that we can show "TPU", "GPU" ... attribution.
old screenshot: https://screenshot.googleplex.com/8KGNxW2eHFY85zw
new screenshot: https://screenshot.googleplex.com/8KVj3jBjShfa8wK
Bug: 227749579
Test: make RunSettingsRoboTests
Change-Id: I22fba3c252a92f7d64670ad5d0f6f3548374968a
2022-04-15 11:20:46 +00:00
Chaohui Wang
e138cffb1b
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d am: d0e84aed9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969
Change-Id: Idf3f54519d51010ddc2dc3ff50066ed81c468ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 10:32:54 +00:00
Chaohui Wang
538990be94
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969
Change-Id: I0f994cb1cdbad4fb6b963ba2d8ec288968b3545e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 10:16:47 +00:00
Chaohui Wang
fdc32b765d
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev
2022-04-15 09:55:48 +00:00
SongFerng Wang
1928926c66
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 am: 3f701d6924
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: If92c47e6bbf93652ff43cb4102946146bc36bdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 09:41:25 +00:00
TreeHugger Robot
c6e4554848
Merge "When in guest mode hide the rename button"
2022-04-15 09:07:20 +00:00
SongFerng Wang
0abc32a7de
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: Id5187d02b82315ffd9c7490a71ab5ddd3cec9579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:57:50 +00:00
SongFerng Wang
9b6c604742
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: I2b87ec33acef3ff86422ac715a30973fa6fd837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:42:48 +00:00
SongFerng Wang
6296df10da
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: Ib36f32c745b571d18e09e2a5f5ae81220e441fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:22:54 +00:00
SongFerng Wang
3b66c18d75
Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750
Change-Id: Ie05c32e8c7d358d4cfad14cee4dc5f8849384d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 08:06:58 +00:00
SongFerngWang
b50430e09d
[LE unicast] Change the default value for LeContactSharingEnabled
...
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
2022-04-15 15:19:17 +08:00
Menghan Li
7878848acc
Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5 am: 5e8bdb4332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934
Change-Id: I9dfd907c21980e8165b55029b575709458a3959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 04:45:52 +00:00
Menghan Li
19846d0c9a
Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934
Change-Id: Id50e2858b4791c58b66d1d21a157c94ad60ec8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 04:22:30 +00:00
Menghan Li
361d42afe5
Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev
2022-04-15 04:00:11 +00:00
Chaohui Wang
3ce806d870
Fix scrolling position not kept in Trusted Credentials
...
For example when changing display states.
Save view states to solve this issue.
- Save current tab. (System / User)
- Save group expanded state. (Personal / Work)
- Save scrolling position of each group.
Also updated to ViewPager2 and updated the styles.
Bug: 204839552
Test: manual
Change-Id: Ibeda50b50e7dfd2ba071b75fe2aa88ef560f4c88
2022-04-15 10:12:36 +08:00
menghanli
50520c2d3f
Fix inconsistent shortcut strings on accessibility setting and edit dialog
...
Root cause: Base class provides an override function for accessibility settings shortcut preference. But, it cannot update to the edit dialog.
Solution: Refine the resilience function and base class apply into accessibility settings shortcut preference and edit dailog.
Bug: 228830417
Test: Manual testing on all accessibility page and edit dialog
Change-Id: I84bc63a39cd9cfa7e12944dff20ee6b92879008d
2022-04-15 00:31:03 +00:00
Chaohui Wang
4d0df6d16f
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f am: 467676063e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148
Change-Id: I696518d33b0e79f5b297c99829cf884de1a1b2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 00:03:52 +00:00
Chaohui Wang
d9c7a49ce7
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148
Change-Id: I06abe7c118003f5b1230b77d1c3bdd724095eb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:42:01 +00:00
Chaohui Wang
fbafdbdd8f
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev
2022-04-14 23:22:19 +00:00
TreeHugger Robot
acfae4627d
Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d am: 7d8a2c0978
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488
Change-Id: Id5292daf9d70c36055c2819d8045bb61d0fc99b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 21:54:20 +00:00
TreeHugger Robot
8a4420f4a6
Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488
Change-Id: I0487097adc087bc2b9aa540de02fa49c600ee487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 21:39:35 +00:00
TreeHugger Robot
dc8b0a5e2d
Merge "Update dream settings categories, to fix padding." into tm-dev
2022-04-14 21:21:22 +00:00
TreeHugger Robot
5b8ba0b768
Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 1a83cbde6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486
Change-Id: I7d0dfc26c91e24bbae3f3458d44215856cec5537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:43:42 +00:00
TreeHugger Robot
89fdd90031
Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486
Change-Id: I7627384562f1382494f857c8baee444ba9e3539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:08:17 +00:00
TreeHugger Robot
2f178cfdf3
Merge "Set Active dream to not be clickable when active." into tm-dev
2022-04-14 19:41:32 +00:00
Lucas Silva
d8b90650d3
Update dream settings categories, to fix padding.
...
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.
Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
2022-04-14 18:59:53 +00:00
Victor Truong
05e824e9e0
Set Active dream to not be clickable when active.
...
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".
Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
2022-04-14 17:38:26 +00:00
Yuri Lin
554ab1fe3e
Special handling for intent coming from "welcome" notification.
...
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.
This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).
Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
2022-04-14 12:54:56 -04:00
Quang Luong
132e8286cb
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 6f7a9b88ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I842c62d47fff47de41dcc40a18eca8f777ecc1db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:51:21 +00:00
Quang Luong
0bbdf3a983
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:34:52 +00:00
Quang Luong
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
2022-04-14 16:14:21 +00:00
YK Hung
5c13bfb2cb
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: 2fbedfdb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: Ia0cb4f1dbaf177eec41fc81956c2cd0921b1caca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:54:18 +00:00
YK Hung
fe2e6b19d8
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 14:33:31 +00:00
YK Hung
3a08246bd9
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev
2022-04-14 14:12:33 +00:00
Neil Fuller
7a8ac683d4
Fix logic used for auto time zone settings
...
Fix the logic used that determines whether the automatic time
zone detection toggle is available in the Settings UI Date & Time
screen. Also, ensure that the TimeZonePreferenceController uses correct
logic for whether the user can manually enter a time zone.
This change migrates the controllers to use a existing high-level
TimeManager API rather than (incorrectly) duplicating in Settings UI the
logic for whether time zone detection is supported / enabled.
Without this change, WiFi-only devices _with_ location-based time zone
detection enabled would incorrectly hide the "auto time zone" toggle,
which would have the knock-on of making it look like the user is allowed
to enter a time zone manually when they aren't (because it is
enabled/disabled based on the presence of the toggle).
That toggle still needs to be present while there is a possible time
zone detection mechanism. All the (quite complex) logic around this is
already considered by the TimeManager API.
Possible side effects:
This change decouples the "does the toggle show true or false?"
(isEnabled()) from the "should the toggle be shown at all?"
(isAvailable()) logic by removing a call to isAvailable() inside of
isEnabled(). This is to avoid making multiple (probably more expensive
than what it was doing before) calls to the time_zone_detector service,
and avoid the extra complexity of caching / cache invalidation that
would be needed to mitigate it. Previously, as a result of the call to
isAvailable(), isEnabled() would always return false when mIsFromSUW is
true, but now it will return the underlying value of the device's
auto_time_zone setting. This means that if the UI is changed in future
to render a visible-but-can't-be-changed-by-the-user toggle for auto
time zone, it will display the current setting value, which is perfectly
reasonable. It is assumed it will have no other side effects.
The AutoTimeZonePreferenceControllerTest.isFromSUW_notEnable test has
been changed to reflect the change in behavior. Various name changes
made to tests to reflect the new behavior.
Bug: 228247623
Bug: 186625820
Bug: 172891783
Test: treehugger
Test: Manual test on a device with telephony
Test: m ROBOTEST_FILTER=AutoTimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Test: m ROBOTEST_FILTER=TimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I4c7608e8645eee5994c8ecf85a14a27d3278ac04
2022-04-14 13:26:05 +00:00
ykhung
39972db17d
Pass the activtiy launch flags into the AdvancedPowerUsageDetail
...
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
2022-04-14 19:57:14 +08:00
SongFerng Wang
89ea026791
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 52052bd1b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: I90bfc429b4a7ebdec3213ab111d433dc372f1682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 11:29:01 +00:00
Hugh Chen
bf81ecd75f
When in guest mode hide the rename button
...
Bug: 198173108
Test: local test
Change-Id: I29eb227104baa43ab8223f86a6a5d9cecd612bde
2022-04-14 11:21:07 +00:00
SongFerng Wang
8cde4c0745
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Ifafae2079cf881aa64285e40759f8a2946034385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 10:34:43 +00:00
Tom Hsu
20c1f7b6d4
Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 0d204eadef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742047
Change-Id: Ic2c84b0da4a6546e96ab4bcac760d7dce9c4534c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 10:12:29 +00:00
SongFerng Wang
b1166a441c
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Ibcd93e3f6610c1f1dfbfa687ba8bec390b8456b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 10:11:52 +00:00
SongFerng Wang
9d10f0a9fb
Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: If1486cddb0887de41eef67dcdb04fe385261cbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:37 +00:00
SongFerngWang
10d36c9800
In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I754af5b8ba51d3cfb73fc894796163209cf8d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:36 +00:00
SongFerngWang
bca382eefb
[MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: I88fe8f02e2cfc1d65a2626290b747cc454958819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:35 +00:00
SongFerngWang
ffdf3513ec
[MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I0f664206c950dae9204f36f1a28f1c63112b9bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:34 +00:00
SongFerngWang
d65110a8ff
Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: Id6de8ec6e269fc6720c57ee04bd2e26d90293ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:32 +00:00
SongFerngWang
56f8390f6e
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: I5ec77b0842dd250095adbb1cc063ec9d9e656a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:31 +00:00
SongFerngWang
b8a9355134
[MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: I64b9af4dca993a57954ef9163f5fa1dd5bd6da89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:30 +00:00
SongFerngWang
f74ef50676
[MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562
Change-Id: I3ed592f99798051fc56100e7bbadbf1c0fcc9260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:28 +00:00