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

85449 Commits

This Branch
This Branch
All Branches
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
bef59d99c8 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 49d0153039 am: 1777269c87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I647ee6a28a691132f5d5b49f0d01d4c72b86446d
 2021-05-26 11:30:43 +00:00
Automerger Merge Worker
e959cc554f 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 2021-05-26 11:01:20 +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
1777269c87 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 49d0153039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I8816392867a15914859d10d62e73219319516514
 2021-05-26 11:01:13 +00:00
TreeHugger Robot
49d0153039 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I57839d47380e9e56f1442f1d51c8254baf2be411
 2021-05-26 10:53:30 +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
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
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
Betty Chang
360cf8a97f Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb am: cf81b181ae am: f4ded72d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: Ifd13ac320188cb454420623c9ecad1c39073d25c
 2021-05-26 09:19:57 +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
f4ded72d3e Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb am: cf81b181ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: Icbd5fc0fd8eff0f06ba893af0d210dbad81e6d75
 2021-05-26 08:35:27 +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
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
Jason Chiu
171c948091 Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8 am: 8bf47584de am: 77dae23b10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966

Change-Id: Ib1e3a066e02c0e75662adf7df1dd9350de4d2498
 2021-05-26 07:57:58 +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
Betty Chang
3007bc21cb Merge "Remove all the dividers in Wifi Settings" into sc-dev 2021-05-26 07:54:28 +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
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
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
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
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
4cfcee154b Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783 am: 064127c180 am: ed09d2fe29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962

Change-Id: Ie98ea4a67981147ba61e5a645b8b8c06b18ffed1
 2021-05-26 04:55:09 +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
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
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