Jason Chiu
77dae23b10
Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8
am: 8bf47584de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966
Change-Id: I98ed35137df6196bb3b84903c58edfcf6f107789
2021-05-26 07:42:09 +00:00
Wesley Wang
da5b7ee353
Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4
am: 92f6d4fdf3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372
Change-Id: If6e5844ac6bf4719807b0bffbfa1e747f1f54c30
2021-05-26 07:41:33 +00:00
Jason Chiu
8bf47584de
Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966
Change-Id: I739489bec757b073061b6a55bae95572a07659c9
2021-05-26 07:20:45 +00:00
Wesley Wang
92f6d4fdf3
Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372
Change-Id: Ibfc10e4c5baef8d31052cd040d1a685e9ff102bd
2021-05-26 07:20:12 +00:00
Jason Chiu
a1b818a8d8
Merge "Add icon declaration in metadata for injected activities" into sc-dev
2021-05-26 07:11:05 +00:00
Wesley Wang
a967b88ee4
Merge "Add new battery entry into AppInfo page launch variable" into sc-dev
2021-05-26 06:59:13 +00:00
Yanting Yang
821ee0e420
Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454
am: 3765c438b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095
Change-Id: Ib45640b730b8efe2df5d42aa9249d63b9e277592
2021-05-26 06:46:48 +00:00
Yanting Yang
3765c438b9
Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095
Change-Id: I44cc0c97c0b144463592fa8b70b615d8acfcb905
2021-05-26 06:33:54 +00:00
Yanting Yang
4fce42c454
Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev
2021-05-26 06:20:38 +00:00
TreeHugger Robot
ed09d2fe29
Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783
am: 064127c180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962
Change-Id: If21480eda524a142c5f76d13a2943de43f8a460d
2021-05-26 04:30:25 +00:00
TreeHugger Robot
064127c180
Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962
Change-Id: I5ba139bfa82522f47dced4f6180f63abfe555936
2021-05-26 04:09:28 +00:00
TreeHugger Robot
f6d0845783
Merge "Tweak right padding for multiple preferences" into sc-dev
2021-05-26 03:36:54 +00:00
Yanting Yang
56b9b2c6dd
Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485
am: afe7960d57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756
Change-Id: I9078e109061e06cdb714dd34ba85c015a6f4ee36
2021-05-26 02:41:18 +00:00
Yanting Yang
6901a23fb0
Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463
am: b5a6f5f611
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193
Change-Id: I268a0d80d38d205e62062662d00712fd35f9dfb5
2021-05-26 02:41:12 +00:00
Yanting Yang
afe7960d57
Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756
Change-Id: Ice8564d27c6668235788e160954819038cd0e8b3
2021-05-26 02:27:45 +00:00
Yanting Yang
b5a6f5f611
Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193
Change-Id: I975c3999726120c7a99a38e743a476958faee85c
2021-05-26 02:27:37 +00:00
Yanting Yang
c10cfff485
Merge "Remove silky flag from Apps for official release" into sc-dev
2021-05-26 02:09:19 +00:00
Yanting Yang
bf99c92463
Merge "Remove silky flag from App info for official release" into sc-dev
2021-05-26 02:06:48 +00:00
TreeHugger Robot
58a913b3d0
Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
am: fcb9b44443
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190
Change-Id: Ic3fa4e2628afae3561854a4e47e1e4cc26c3561a
2021-05-26 02:02:03 +00:00
TreeHugger Robot
fcb9b44443
Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190
Change-Id: I62cd5645b37878bcb7716c7cd731ce5d2358836a
2021-05-26 01:30:44 +00:00
TreeHugger Robot
32ea479cc9
Merge "Apply setup wizard's transition on a11y pages" into sc-dev
2021-05-26 01:13:14 +00:00
TreeHugger Robot
dbff898f60
Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
am: 31205a549f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654
Change-Id: I0d8f18fe74fd3b9ba12778d8dc35de109fbe1677
2021-05-26 00:44:34 +00:00
TreeHugger Robot
caa0805121
Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
am: ebf9d33fb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355
Change-Id: I708894fa914d09bef68d4ca660e5334ecf090e58
2021-05-26 00:44:22 +00:00
TreeHugger Robot
31205a549f
Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654
Change-Id: Iaef3598992e7f1118b8650ea3bb5cd51434ded56
2021-05-26 00:31:48 +00:00
TreeHugger Robot
ebf9d33fb9
Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355
Change-Id: I4613a279913d99996cf4ae578184f9569d228f25
2021-05-26 00:30:56 +00:00
TreeHugger Robot
a4fc228b55
Merge "Consolidate app notification setting prefs" into sc-dev
2021-05-26 00:19:26 +00:00
TreeHugger Robot
0eaf329a43
Merge "Query storage size instead of calculate size of installed APP" into sc-dev
2021-05-26 00:13:16 +00:00
Yanting Yang
6bf1c3675d
Correct breadcrumbs of Wallpaper & style
...
Remove the sitemap connection between Display and Wallpaper & style,
since we already moved the Wallpaper & style to the homepage.
Bug: 182708819
Test: robotests & visual
Change-Id: Ia069be91177d8fef56248b5343c41a13ef8267a2
2021-05-26 05:43:53 +08:00
TreeHugger Robot
b2db07d43b
Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
am: d3da337d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432
Change-Id: Ib19e368eee6a631ea64b40c862d05df5dae68e4b
2021-05-25 21:18:43 +00:00
TreeHugger Robot
d3da337d75
Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432
Change-Id: I92d7a42645feb86f578f3cd63399ef701554a853
2021-05-25 21:02:51 +00:00
TreeHugger Robot
547cac8d9a
Merge "Update custom zen settings "off" string" into sc-dev
2021-05-25 20:46:46 +00:00
Felipe Leme
ac5788175c
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
am: 779d68ca4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084
Change-Id: I7262ea5fbf020382e261d976cedae226ce37280b
2021-05-25 19:30:09 +00:00
Felipe Leme
779d68ca4b
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084
Change-Id: I6c3d96994d7faa0af63f43911bf382c83219f00d
2021-05-25 19:29:36 +00:00
Felipe Leme
d51e6cb7a4
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev
2021-05-25 19:13:18 +00:00
TreeHugger Robot
aae3e29f3b
Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
am: 2fa3ec90a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760
Change-Id: I3295f9fff780ccb4569a34cf7059be8ba1c1b13d
2021-05-25 19:04:46 +00:00
TreeHugger Robot
2fa3ec90a4
Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760
Change-Id: Idad8cf30fb63f461e3abe2698c5e523ecab2e20a
2021-05-25 18:50:26 +00:00
TreeHugger Robot
9018434111
Merge "Apply sliding transition for lock screen" into sc-dev
2021-05-25 18:35:13 +00:00
Beverly
06b1ba1d09
Update custom zen settings "off" string
...
zen_mode_sound_summary_off should only be used when describing the
number of schedules that are enabled (and requires a numeric parameter).
Instead, use the string "off" when a sound isn't enabled by a custom dnd
setting.
Fixes: 189120026
Test: manual
Change-Id: I8bc180353a61455b124801d14f0d319f49bb341c
2021-05-25 13:31:52 -04:00
Julia Reynolds
e81b8275a8
Consolidate app notification setting prefs
...
Test: manual
Fixes: 189201867
Change-Id: If5cc03e0bd2d4273cd842e097b99b15d1178f3dc
2021-05-25 11:57:06 -04:00
Arc Wang
044c91cc70
Query storage size instead of calculate size of installed APP
...
From android S, Storage Settings show files of images/videos/audios
category instead of installed APP of each category. So it's
necessary to change the way to calculate size information.
This change also
- StorageItemPreference shows changing storage size units instead
of fixed GB. It helps UX for categories of only small size files.
- Query media provider for size of Documents and others.
- Query media provider for size of Trash.
Bug: 170918505
Bug: 177892478
Bug: 179871408
Bug: 184379946
Bug: 186077224
Bug: 187128447
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
manual visual
Click each file category to count files size is the same as
displayed in Storage Settings.
Change-Id: I37c7b3a4b5860323cb55581b23a90f583f4af216
2021-05-25 23:44:21 +08:00
TreeHugger Robot
8bac70524b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours am: 37947fc40c
-s ours am: 83c9b66bde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: I82d820f69aa5da48cff357cfc6165f37931c4933
2021-05-25 15:39:58 +00:00
Bill Yi
291434e246
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours am: 1474e88ef3
-s ours am: fd33e355bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: I119a7f1364482afc88003834aae0ef8bf692e32c
2021-05-25 15:39:45 +00:00
TreeHugger Robot
83c9b66bde
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours am: 37947fc40c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: Ic4211f334b1b4909f3f1cb256a3bcd5d5dbaea67
2021-05-25 15:17:01 +00:00
Bill Yi
fd33e355bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours am: 1474e88ef3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: I54c577e1a7edec9002ebe462db60e6752f3ae18a
2021-05-25 15:16:48 +00:00
Wesley.CW Wang
92feb9e8fc
Add new battery entry into AppInfo page launch variable
...
- Insert uid as launch variable
- Add new launch type into AppInfo page
Bug: 178197718
Test: make RunSettingsRoboTests
Change-Id: I8c68bebd02491dbbc1516bbebc14254ed06940f6
2021-05-25 23:13:03 +08:00
TreeHugger Robot
e1e2cb07a9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6
-s ours am: f556c56609
-s ours am: ba541184cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710137
Change-Id: I02d984502ac1093a1d63f3e2336847ec89b0da9c
2021-05-25 15:00:09 +00:00
TreeHugger Robot
37947fc40c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: I6f0f358961066530f199940f196f4a3ef19b654b
2021-05-25 15:00:06 +00:00
Bill Yi
ffbaa0602d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df
-s ours am: 9769c467a3
-s ours am: 585a56bcef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710138
Change-Id: I86ea73bf3d9270dc92a4f57f1f7e5629285c636a
2021-05-25 15:00:05 +00:00
Bill Yi
1474e88ef3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: I09016ff83f9d48a2fd2f925c8ecbfbeed49a1c20
2021-05-25 14:59:56 +00:00
TreeHugger Robot
f7657138b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6
-s ours am: 3f259b2d28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710143
Change-Id: Ia3ab4090cbdb563fba582ac2541e97f7f1d6274a
2021-05-25 14:59:53 +00:00