Hugh Chen
3c354a2d38
Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev
2022-04-18 01:50:07 +00:00
Chaohui Wang
37375565e5
Fix sub status of LocationSettings
...
Fix the followings:
Recent access apps are not displayed after toggling off/on
"Use location".
When "Use location" is enabled, "Location for work profile" switch is
disable and gray out.
Fix: 227621199
Fix: 227265216
Test: manual
Change-Id: I9f955a381827eb020fbd0d6ebeb9fced3dec1dcf
2022-04-17 19:38:39 +08:00
ykhung
91adbd3b16
Use en-dash in the time range instead of a hyphen for different format
...
Expected format: 00:00–02:00 or (2pm – 4pm)
Screenshots:
https://screenshot.googleplex.com/4RvaovK6RN7kjqo
https://screenshot.googleplex.com/ADZRr2TPuuctFre
Bug: 229264053
Test: make RunSettingsRoboTests
Change-Id: Ifd9bea0ce4525c8b582778e255104e875d365563
2022-04-17 06:52:24 +00:00
ykhung
b593e00af0
Format BatteryEntry and BatteryDiffEntry class
...
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
2022-04-17 06:23:47 +00:00
Bill Yi
afa4a259d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e709cfb3984b5110869cbedb5d27a43ea7299fb
2022-04-17 04:36:18 +00:00
Bill Yi
713df54284
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie2f06fafcafd8eb46fd5e53a8b489eb41cca4997
2022-04-17 04:32:46 +00:00
Peiyong Lin
586bcd69d9
Clean up extra app info.
...
Bug: b/224595815, b/229336010
Test: manual
Change-Id: I21cda5a4a5f8f378a532ac0fd4e91c2cc011ed95
2022-04-16 00:47:05 +00:00
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
TreeHugger Robot
36414eab28
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev
2022-04-15 11:47:55 +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
fdc32b765d
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev
2022-04-15 09:55:48 +00:00
Hugh Chen
e9864510ab
Change "Previously connected devices" string to "Saved devices"
...
Bug: 215230194
Test: local test
Change-Id: I0ae7f71b798f5582ff62f20ce639133242c30b3f
2022-04-15 09:51:30 +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
SongFerng Wang
48967e6466
Merge "[LE unicast] Change the default value for LeContactSharingEnabled"
2022-04-15 07:23:39 +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
ykhung
e431df2036
Remove singeLine attribute in the usage chart divider
...
Remove the android:singleLine attribute in the expand divider layout to support other language to avoid the content is truncated.
old screenshot: https://screenshot.googleplex.com/7JCnrQAXJM8zjMM
Bug: 229265247
Test: N/A
Change-Id: I9038e69a9ab035b4e0599ca20e11fbccd471f76f
2022-04-15 07:00:57 +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
fbafdbdd8f
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev
2022-04-14 23:22:19 +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
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
TreeHugger Robot
a5a1c5710e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb
-s ours am: d22b43c6a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: I6370b4b7c11bdb4d2514c601acd93b141060e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:55 +00:00
Bill Yi
db2dfb95da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2
-s ours am: 812e79c8cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: I86f0b1dc43806b330b5d18f36aba3dea181b14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:52 +00:00
TreeHugger Robot
f26007c8ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c
-s ours am: c53da610b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: Id50ca54e69d4273ef635cce3db7f15ded82a0163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:04 +00:00
Bill Yi
006db32086
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550
-s ours am: 57b6374513
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: I511a9059ccf3c323d7eb7cc96438b3c27bff6bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:00 +00:00
TreeHugger Robot
d22b43c6a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: Ib8d08684f79433ec17dfad8daf29de4e23b28eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:26 +00:00
Bill Yi
812e79c8cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: Ic507bfd58ddae3eef0b30505327b18ceac24e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:24 +00:00
TreeHugger Robot
c53da610b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: If3fcaae0791677a5244d0006375b38f09847194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:15 +00:00
Bill Yi
57b6374513
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: I1a89457b55725eb781c4106d2a15ee53a15d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:01 +00:00
Bill Yi
20efc0cc64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I9ba51c4cd89e5182cdc096a4b18179e5a641405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:13 +00:00
Bill Yi
4b073cf421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I0ddd79cb6636eba32d51861c90fd5f5bfcf1bacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:08 +00:00
TreeHugger Robot
0312b67407
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf
Merge "Add hyphenation to customize button text." into tm-dev
2022-04-14 17:39:13 +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
Bill Yi
b67694c1cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:17:45 +00:00
TreeHugger Robot
940c2d25fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:54 +00:00
TreeHugger Robot
2212edb907
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:08:33 +00:00
TreeHugger Robot
e3b581c350
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:08:18 +00:00
TreeHugger Robot
55e91da24e
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
Import translations. DO NOT MERGE ANYWHERE
2022-04-14 17:08:18 +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
TreeHugger Robot
37c2ac2c6a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev
2022-04-14 16:28:11 +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
Lucas Silva
1ccbf8b7d5
Add hyphenation to customize button text.
...
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.
Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
2022-04-14 14:48:14 +00:00
Tsung-Mao Fang
7877c073e5
Merge "Use androidx.window from prebuilt." into tm-dev
2022-04-14 14:40:21 +00:00