PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,052 Commits 1 Branch 0 Tags
cd82b94effb435ae4ef388cb95cf0248343cd411
Commit Graph

82052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cd82b94eff Merge "Simplify the transition logic." into sc-dev am: 5b24943b06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: Ib9ce328500c32c9e10a31c6e0a7fa0a6aa7e49c0
 2021-05-26 10:46:19 +00:00
TreeHugger Robot
9e9c2508bf Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: Ie358e3e5e591a094a56f94da6957257e1e80ff01
 2021-05-26 10:46:02 +00:00
TreeHugger Robot
5b24943b06 Merge "Simplify the transition logic." into sc-dev 2021-05-26 10:45:41 +00:00
TreeHugger Robot
4f9d0f4eb4 Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev 2021-05-26 10:26:20 +00:00
YUKAI HUNG
64a11c5a87 Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402

Change-Id: Id2090b3130faf66b16191f7707648c6a97ce5ac1
 2021-05-26 09:29:02 +00:00
YUKAI HUNG
7164ec8863 Merge "Disable app usage item if this item is not clickable" into sc-dev 2021-05-26 09:25:54 +00:00
TreeHugger Robot
9035a8f4bb Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606

Change-Id: Ib164239dd7d105faca19a6bef5e1e877e5c8b074
 2021-05-26 09:24:02 +00:00
Yanting Yang
97d6bac2f4 Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096

Change-Id: I8a62acbd8d9ff7b9fde22a83001a05dad7148d22
 2021-05-26 09:21:37 +00:00
TreeHugger Robot
328de8d98f Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev 2021-05-26 09:21:34 +00:00
Yanting Yang
d5aaf326e7 Merge "Remove silky flag from Display for official release" into sc-dev 2021-05-26 08:35:32 +00:00
Betty Chang
cf81b181ae Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: Id669e954f7820371ad3f2ab77115605436869ef4
 2021-05-26 08:14:12 +00:00
Betty Chang
3007bc21cb Merge "Remove all the dividers in Wifi Settings" into sc-dev 2021-05-26 07:54:28 +00:00
Yi-Ling Chuang
8871134dcd Simplify the transition logic. 
- Only override startAcitivtyForResult() as other methods will also fall
to that one.

Bug: 187542491
Test: rebuild and navigate through pages
Change-Id: I2d5cf0c3deaa858d44c4330600e88b0f33ce0594
 2021-05-26 15:51:02 +08:00
Patty
c491216243 Fix pairing dialog doesn't show the correct pairing key. 
When the pairing dialog doesn't show in the foreground at the first time, the pairing key will display incorrectly.
This is caused by the intent doesn't contain the parameter BluetoothDevice.EXTRA_PAIRING_KEY.

Correct the pairing key by passing the pairing key to intent pairingDialogIntent.

Tag: #stability
Bug: 188614067
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingServiceTest
Change-Id: I3c91bf6ea51fa3fb77b4c4a5c17555606160603e
 2021-05-26 15:46:00 +08:00
YUKAI HUNG
1fea339388 Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397

Change-Id: Idbcbb9d31889fc29836f4c725fac503cd77a2149
 2021-05-26 07:35:28 +00:00
ykhung
46bcdda9b9 Disable app usage item if this item is not clickable 
some items are not clickable to launch the restriction page in the
battery usage list, we will apply the disabled visual in the
preferrence item to improve the UX (avoid users click the item without
any action)

Bug: 188751551
Bug: 188663505
Test: make SettingsgRoboTests
Change-Id: Ib8925b8e191117543bb1c74d6d01191e3043fc73
 2021-05-26 07:27:01 +00:00
YUKAI HUNG
f49190d769 Merge "Refine consumed battery value formula for power component" into sc-dev 2021-05-26 07:26:20 +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
Sunny Shao
e0c921a8fa Fix the extra speaking in Allow supervision dialog 
- Extra speaking the  "double tap to activate" when focus
  "Family Link manage ...".
- Root cause: this Textview set the setMovementMethod method.
- Solution: Remove this setMovementMethod because it is usless in here.

Bug: 187968203
Test: manual test
Change-Id: Ia3f277f6814cb009f0e07f56381e3e46fbacc7a8
 2021-05-26 14:53:14 +08: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
c2ac66cadc Remove silky flag from Display for official release 
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: I139f1dbc1ca030ccb0b778c479e0b23289c1c282
 2021-05-26 14:25:43 +08:00
Yanting Yang
4fce42c454 Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev 2021-05-26 06:20:38 +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
changbetty
3f6bccc87c Remove all the dividers in Wifi Settings 
Bug: 189049289
Test: manual test
Change-Id: Ib2b884e36837bf9cc30c6af554c774bda8e7322b
 2021-05-26 11:19:03 +08: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
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
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
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
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
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
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