Commit Graph

82683 Commits

Author SHA1 Message Date
TreeHugger Robot
eeb1269983 Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1 am: afe0ff787d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271

Change-Id: Id29c6d6d8d7a6f247afd46fdc624a503282fc4c2
2021-05-21 10:15:14 +00:00
TreeHugger Robot
afe0ff787d Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271

Change-Id: Ia5e72969e61f8af560a2617579386bd031891bbe
2021-05-21 10:00:14 +00:00
TreeHugger Robot
c964e1ff0d Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639271

Change-Id: I4a9d100a2c4bee2ecaceb3865963ac5a5ff51099
2021-05-21 09:57:34 +00:00
ykhung
e030d8613a Fix footer preference may flash one time when entering
new solution > We will not show the footer preference in the beginning when users entering the app, it will wait until the data is loaded to show the footer and app item in the same time. We also enhance the footer message as "Battery usage data will be available after you use your phone for a few hours" when there are not content in the begining.

Bug: 187766862
Bug: 188871770
Test: make SettingsRoboTests
Change-Id: I8d19173b4402722797b1ae3c4cfe6dcdf2d3fe3f
2021-05-21 09:50:43 +00:00
TreeHugger Robot
417af889e1 Merge "Fix overlapping problem for device admin page" into sc-dev 2021-05-21 09:42:05 +00:00
changbetty
8267a2757f Remove the Network rating provider item
Bug: 187119482
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Iff4a7663c0bca8f0553fcd16673a9aa766050ff4
2021-05-21 17:08:44 +08:00
TreeHugger Robot
4d687af52f [automerger skipped] Merge "Make preference title align after icon" into sc-dev am: d573f1d19e am: fd54b6254d -s ours
am skip reason: Merged-In Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad with SHA-1 600d023892 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997

Change-Id: I4a24d9dfef73b2b2131e780d50e902e7a5d6bcd0
2021-05-21 08:47:18 +00:00
Weng Su
a4821a4fdd Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1 am: 9cce69a6e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867

Change-Id: I8eee744969d25700f83f25f73f23ee033ce8db7f
2021-05-21 08:46:52 +00:00
TreeHugger Robot
bd2949eacf Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59 am: fecce407a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077

Change-Id: I7d27e3c91afbff65a6f562f0d01f98615d961706
2021-05-21 08:46:47 +00:00
TreeHugger Robot
fe8f4b24cc Merge "Make preference title align after icon" into sc-dev am: d573f1d19e am: ee1f633cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997

Change-Id: Ib22aea442a4f8e3142fe85d4252b8d930770d9cc
2021-05-21 08:45:52 +00:00
Weng Su
6598c5f26a Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1 am: ab2394c773
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867

Change-Id: Ia12b88b537f7df62812954e6463480dc02541df6
2021-05-21 08:45:12 +00:00
TreeHugger Robot
6fba19fbf4 Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59 am: d66f004a86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077

Change-Id: Ieb8f3a7f86b9cdbc7bbb546ec803b1ad8cc2fde0
2021-05-21 08:45:07 +00:00
TreeHugger Robot
ee1f633cf0 Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997

Change-Id: I891135a8ef9ec07ff0c7ddbc8363836ad78e6198
2021-05-21 08:37:20 +00:00
TreeHugger Robot
fd54b6254d Merge "Make preference title align after icon" into sc-dev am: d573f1d19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609997

Change-Id: I0e796d90f4b7bc4917ff96b212d972b1e87b5f48
2021-05-21 08:34:21 +00:00
ryanlwlin
964872ab96 Fix incorrect seperator while concatenating shortcuts
We concatenate the selected shortcut with a comma
that is not localized. To fix it we use listformatter
to concatenate them.

Bug: 186891004
Test: manually test with differnt languages.
Change-Id: I2c6692facd457b434c56a0633e784ce771905b29
2021-05-21 16:32:23 +08:00
TreeHugger Robot
d573f1d19e Merge "Make preference title align after icon" into sc-dev 2021-05-21 08:30:46 +00:00
Weng Su
ab2394c773 Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867

Change-Id: Idec3564639a8c04436dc70de70bc68976dbf73d7
2021-05-21 08:28:59 +00:00
TreeHugger Robot
d66f004a86 Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077

Change-Id: I1009d13355a0ce305faac57d06d9e7ab436d815a
2021-05-21 08:28:54 +00:00
Weng Su
9cce69a6e8 Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev am: 72dd0830e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622867

Change-Id: I479bfacdfb839d46276bc3a5d8b44916ed2ed9c8
2021-05-21 08:25:29 +00:00
TreeHugger Robot
fecce407a2 Merge "Fix talkback doesn't speak subtext info" into sc-dev am: 10e732bd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663077

Change-Id: If5ca8490581c8e9d369daa37efdc94755359f590
2021-05-21 08:25:22 +00:00
Weng Su
72dd0830e1 Merge "[Provider model] Revise the Internet Panel title sub-text" into sc-dev 2021-05-21 08:14:07 +00:00
TreeHugger Robot
10e732bd59 Merge "Fix talkback doesn't speak subtext info" into sc-dev 2021-05-21 08:08:44 +00:00
Edgar Wang
600d023892 Make preference title align after icon
- Running service should use app preference layout.
- RestrictedDropdownPreference should use preference layout.
- Tweek Storage item icon padding
- Wifi calling should use Prefernce
- In Open by default page, if there is no vierfied link, we should
  hide the checkbox.

Bug: 186069482
Test: manual
Change-Id: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
Merged-In: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
2021-05-21 07:21:59 +00:00
Arc Wang
9bead5f8f6 Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18 am: 7bfd089e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: Ia35aca3144a4ca459141af4491111c367f708d83
2021-05-21 06:54:27 +00:00
Yanting Yang
a9c4ccd946 Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev am: 87093d40d0 am: 793b2bd42f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663087

Change-Id: I1f2bac8bb495736507a16550c61aae4c42d7b609
2021-05-21 06:51:55 +00:00
Arc Wang
766ddfce34 Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18 am: e7e25f12f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: I493ded0f0cfd753f9072d8095231bbebe9b3fdda
2021-05-21 06:50:27 +00:00
Yanting Yang
0ce63b411d Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev am: 87093d40d0 am: 305520fe25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663087

Change-Id: I40e23c486922bf532c4d7aef174979201f07d30b
2021-05-21 06:50:08 +00:00
Arc Wang
e7e25f12f1 Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: I227b20c455ef1fc7792cb7e92d6cf325f043503c
2021-05-21 06:36:34 +00:00
Yanting Yang
305520fe25 Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev am: 87093d40d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663087

Change-Id: Iaaa2f17228a8bb4146b0bfdf969b7a64380fb1d5
2021-05-21 06:36:20 +00:00
Arc Wang
7bfd089e52 Merge "Shows "This device" for default internal storage" into sc-dev am: 8b5913ba18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609996

Change-Id: I88d314009c86279bfb164a8d75bd48f3c9a2f1dd
2021-05-21 06:33:46 +00:00
Yanting Yang
793b2bd42f Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev am: 87093d40d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663087

Change-Id: Ie23145c9c2aaf1b2c75d69917608f2c689cf3975
2021-05-21 06:33:34 +00:00
Arc Wang
8b5913ba18 Merge "Shows "This device" for default internal storage" into sc-dev 2021-05-21 06:23:02 +00:00
Yanting Yang
87093d40d0 Merge "Remove the horizontal divider around ActionButtonsPreference" into sc-dev 2021-05-21 06:22:01 +00:00
Yanting Yang
d62082027d Introduce InteractionJankMonitor into Settings
Detects the jank of page scrolling which is implemented by
InstrumentedPreferenceFragment.

Bug: 187306869
Test: verify with Perfetto

Change-Id: Icaa557d1b47a12374298f044e2f9568281589f64
2021-05-21 04:32:55 +00:00
Yanting Yang
e8c24c3e65 Remove the horizontal divider around ActionButtonsPreference
Remove the horizontal divider from App info and App info > Storage
since they are not required anymore with the new style.

Fixes: 188742417
Test: visual
Change-Id: Idc0ab5994694c490ab04fac04a8b114f9fe191a1
2021-05-21 12:24:53 +08:00
alexylli
e6c11957b8 [Settings] Adjusts the result code to cancel when complete redaction interstitial setting
This change can make redaction interstitial can be setup repeatedly in anything else page.

Test: manual
Bug: 185430009
Change-Id: I7ed459ca3017286ab01bc8274704dd01fc50391d
2021-05-21 03:53:15 +00:00
TreeHugger Robot
e8122f8306 Merge "Refactor some transition codes." into sc-dev am: 8c1c7b63a7 am: d708d41f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14660513

Change-Id: I7882c2cf9b0afeb4ddb400a3144d52b0c7b6ee80
2021-05-21 03:07:43 +00:00
TreeHugger Robot
8def2c28c4 Merge "Refactor some transition codes." into sc-dev am: 8c1c7b63a7 am: 181b40ba47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14660513

Change-Id: Ie264e26329bfa13eb3ea3de9b89e4e4059a5de77
2021-05-21 03:02:05 +00:00
TreeHugger Robot
d708d41f37 Merge "Refactor some transition codes." into sc-dev am: 8c1c7b63a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14660513

Change-Id: I0ee58228d7b2d636accc223a2d221dbebd8418bc
2021-05-21 02:47:36 +00:00
TreeHugger Robot
181b40ba47 Merge "Refactor some transition codes." into sc-dev am: 8c1c7b63a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14660513

Change-Id: I254f5266556d0fa498f37a99c5ab6dbf56fa806c
2021-05-21 02:44:26 +00:00
TreeHugger Robot
8c1c7b63a7 Merge "Refactor some transition codes." into sc-dev 2021-05-21 02:33:46 +00:00
TreeHugger Robot
462e501763 Merge "Apply ripple on entire button" into sc-dev am: f8bcde8886 am: 5b5b20bfe0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663079

Change-Id: If621bcfba246aa2534967efe1666316ecc756bcf
2021-05-21 02:24:36 +00:00
TreeHugger Robot
b440b1999d Merge "Apply ripple on entire button" into sc-dev am: f8bcde8886 am: 505c2312b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663079

Change-Id: Ibd8649ea43b4491d35aa79e447cf82390e9df116
2021-05-21 02:22:48 +00:00
TreeHugger Robot
505c2312b6 Merge "Apply ripple on entire button" into sc-dev am: f8bcde8886
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663079

Change-Id: Ibcf3123408b64df4e00ccdb93a78bb2de35eab60
2021-05-21 02:09:46 +00:00
TreeHugger Robot
5b5b20bfe0 Merge "Apply ripple on entire button" into sc-dev am: f8bcde8886
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14663079

Change-Id: I398939349c72cf0b238dfaa3d6bff4e746c94971
2021-05-21 02:08:01 +00:00
TreeHugger Robot
f8bcde8886 Merge "Apply ripple on entire button" into sc-dev 2021-05-21 01:47:56 +00:00
Kevin Chyn
72346d63ed Merge changes I5989a67e,I30a77bd6 into sc-dev am: c24caeb4f8 am: a2e9d4d129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14649896

Change-Id: Ib0989a965d694b6896c10f71864c8de5484375bd
2021-05-21 01:14:38 +00:00
Kevin Chyn
cf25f18fbd Merge changes I5989a67e,I30a77bd6 into sc-dev am: c24caeb4f8 am: 61df90f04e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14649896

Change-Id: Ic97c4d62e4f5a0e1c9aeb0dd948d7beb30ce7d3b
2021-05-21 01:14:09 +00:00
Kevin Chyn
61df90f04e Merge changes I5989a67e,I30a77bd6 into sc-dev am: c24caeb4f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14649896

Change-Id: I5bac5d127873885f3823ff40a5d606aa073ae7e6
2021-05-21 00:58:04 +00:00
Kevin Chyn
a2e9d4d129 Merge changes I5989a67e,I30a77bd6 into sc-dev am: c24caeb4f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14649896

Change-Id: I2c69e4d981e2d883b38fd44c9ffea183cc8aff71
2021-05-21 00:54:57 +00:00