PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,449 Commits 1 Branch 0 Tags
709b8557776c12256e33f7697cb0daa88d2b1453
Commit Graph

37588 Commits

Author SHA1 Message Date
Automerger Merge Worker
709b855777 Merge "Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4 am: 9e9c2508bf" into sc-v2-dev-plus-aosp am: e959cc554f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

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

Change-Id: I71cf66171c5211375fedb8cf5f4a2667937f02e9
 2021-05-26 11:01:17 +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
7045ec0b67 Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 am: 64a11c5a87 am: ff51d80270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402

Change-Id: Iba420b51045795d8ee9f42a1f030e63e020329f5
 2021-05-26 09:52:23 +00:00
TreeHugger Robot
274ac5d14f Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f am: 9035a8f4bb am: 7839e46ba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606

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

Change-Id: Idd559d7c16633e916e52d8fc346db801466ea948
 2021-05-26 09:51:17 +00:00
YUKAI HUNG
ff51d80270 Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 am: 64a11c5a87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402

Change-Id: I345c28cef4e81669aca4cf2e085e6ca5b167ee3e
 2021-05-26 09:35:57 +00:00
TreeHugger Robot
7839e46ba9 Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f am: 9035a8f4bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606

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

Change-Id: I854f59b936562153cdf5fc4a2dd1778454d4712b
 2021-05-26 09:35:45 +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
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
YUKAI HUNG
01f1b6ddea Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769 am: 1fea339388 am: 6b68a9da24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397

Change-Id: I6def66c979b10d9e60cd7237a8be1ff53a954199
 2021-05-26 07:58:33 +00:00
Wesley Wang
1eaac06288 Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4 am: 92f6d4fdf3 am: da5b7ee353 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372

Change-Id: I5c78387f18d1d953828f7cee39b489b08238b97d
 2021-05-26 07:57:42 +00: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
6b68a9da24 Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769 am: 1fea339388 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397

Change-Id: I9b2a16d20979d079f153c20730ba41bbc57b8822
 2021-05-26 07:43:18 +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
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
Yanting Yang
742c627e98 Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454 am: 3765c438b9 am: 821ee0e420 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095

Change-Id: I44f530dfea070a80a239c3d7e7c9e1a2b869fb6c
 2021-05-26 07:01:43 +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
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
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
Yanting Yang
98a63a5be2 Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485 am: afe7960d57 am: 56b9b2c6dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756

Change-Id: Ib08ffde78fb78cb9d6487145ac19b7aa76e3b8bb
 2021-05-26 02:56:30 +00:00
Yanting Yang
ea35c707fb Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463 am: b5a6f5f611 am: 6901a23fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193

Change-Id: I416c6e54483b36786f1df21476133f3cbff76eaf
 2021-05-26 02:56:17 +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
TreeHugger Robot
8d2b23ae02 Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9 am: fcb9b44443 am: 58a913b3d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190

Change-Id: I0b84f70067d38bc43db5827288677deacdd769d4
 2021-05-26 02:18:22 +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
32ea479cc9 Merge "Apply setup wizard's transition on a11y pages" into sc-dev 2021-05-26 01:13:14 +00:00
TreeHugger Robot
05949b648c Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55 am: 31205a549f am: dbff898f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654

Change-Id: I07978ecda8cdae1b8968b823ac9e652b3aeface0
 2021-05-26 01:00:06 +00:00
TreeHugger Robot
a84f439bea Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43 am: ebf9d33fb9 am: caa0805121 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355

Change-Id: I8387c7f9f18d3aaed0f745eee7616b533f5234b5
 2021-05-26 00:59:25 +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
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
61c68666a9 Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a am: d3da337d75 am: b2db07d43b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432

Change-Id: Iafdbf80fd794159adeeabc83be2fa3d2be72fed9
 2021-05-25 21:33:14 +00: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
547cac8d9a Merge "Update custom zen settings "off" string" into sc-dev 2021-05-25 20:46:46 +00:00
Felipe Leme
83f4af30b8 Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4 am: 779d68ca4b am: ac5788175c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: Idd1855308903aaac7dda658a796608a8d3af8fee
 2021-05-25 19:45:24 +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
TreeHugger Robot
719b616833 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 2fa3ec90a4 am: aae3e29f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: I8f0f2e5e9c9a82d3232ddd2e7b4033815d72b5ec
 2021-05-25 19:27:22 +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
9018434111 Merge "Apply sliding transition for lock screen" into sc-dev 2021-05-25 18:35:13 +00:00