Commit Graph

85673 Commits

Author SHA1 Message Date
TreeHugger Robot
7e42912c2e Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a am: 7cd80a4304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

Change-Id: I8905fa4158d0a3a1e03c3c3c20fcb1efe727cf48
2021-07-08 15:48:38 +00:00
TreeHugger Robot
6482e5e1c1 Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a am: 630448d833
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

Change-Id: I9fb2cd1cfaae19361de4abaf5d6424a8c0c1e9a8
2021-07-08 15:48:12 +00:00
TreeHugger Robot
630448d833 Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

Change-Id: I51425b5d5d019c0cbd894707eb25c5024fc19d56
2021-07-08 15:36:27 +00:00
TreeHugger Robot
7cd80a4304 Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

Change-Id: Ic89fdc0b534a45d05c9ce217d1689640c0eca8c8
2021-07-08 15:35:32 +00:00
TreeHugger Robot
2d90a6321a Merge "Hide the entire progress header in Internet Settings" into sc-dev 2021-07-08 15:21:25 +00:00
SongFerng Wang
bea3b02606 Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 9f06b36b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: If8660bbb343ad7aacd9f43f65c6f95a97ffcbb70
2021-07-08 09:08:48 +00:00
SongFerng Wang
1c1a6e5126 Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 91bf9af2ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I03e795d818cee49ec1c0a2d927eee4369bb513f1
2021-07-08 09:08:25 +00:00
SongFerng Wang
91bf9af2ee Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I1a130cc44aba068c5f4bf8141e148ff8b6007ef6
2021-07-08 08:31:11 +00:00
SongFerng Wang
9f06b36b3b Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I1dfb9507da126f8e25ba12535581d40801837d89
2021-07-08 08:30:06 +00:00
SongFerng Wang
a73d199d5e Merge "Network selection add NGRAN when device support SA" into sc-dev 2021-07-08 08:17:19 +00:00
Edgar Wang
11c88ae8de Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: cecc33b5c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I61b2fc5584185a3a0717061355344b647b51b50b
2021-07-08 07:14:41 +00:00
Edgar Wang
40820d2ffe Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 7458b770f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I85f81794536854f29613b5d42922b5297c34ec01
2021-07-08 07:14:33 +00:00
Edgar Wang
7458b770f9 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I10796c5a289712c8b34a0332ae04d078d1d5e562
2021-07-08 07:01:01 +00:00
Edgar Wang
cecc33b5c4 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Iaca806e315ebbd6a7e37daca444ee368b2e79e16
2021-07-08 07:00:43 +00:00
Edgar Wang
723ab59bc0 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev 2021-07-08 05:58:30 +00:00
Menghan Li
2b9a74170f Merge "Provides TC ID for accessibility framework feature for "shortcut" part" into sc-v2-dev am: 2ceb52ea6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186114

Change-Id: I2ed1e81347c404b77d8325337396fd6e4d22e170
2021-07-08 05:28:06 +00:00
Menghan Li
2ceb52ea6b Merge "Provides TC ID for accessibility framework feature for "shortcut" part" into sc-v2-dev 2021-07-08 05:15:27 +00:00
YUKAI HUNG
7c1696899b Merge "Add new method to get URI to monitor battery history data is updated" into sc-v2-dev am: ff823c65d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15218952

Change-Id: Ib8e91b84726f607d16e1b8dc144d853bf906ecf6
2021-07-08 03:28:08 +00:00
YUKAI HUNG
ff823c65d5 Merge "Add new method to get URI to monitor battery history data is updated" into sc-v2-dev 2021-07-08 03:15:18 +00:00
Automerger Merge Worker
70b22b2b94 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp 2021-07-07 17:56:46 +00:00
TreeHugger Robot
f2b4dbf29e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I662fd17708384107c65a2402f9ad0c65c5ac10c6
2021-07-07 17:56:42 +00:00
TreeHugger Robot
44b8d2022e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 20cab601c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95d430d8b1cdc25672374cebc59b889d6b5f8fbe
2021-07-07 17:56:40 +00:00
TreeHugger Robot
20cab601c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9d29403c7efa123b5040bd7e83565463eee25b9
2021-07-07 17:38:03 +00:00
TreeHugger Robot
798d6c5df4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I51f5acdf164503eb543183299dc235e26a9e5c8e
2021-07-07 17:36:56 +00:00
TreeHugger Robot
b65883e22f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-07 17:25:11 +00:00
Guojing Yuan
0cf54d33f2 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: fbce4ec0e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Id7b35be4f8a8713afa551723302fb35a097bebf9
2021-07-07 17:24:05 +00:00
Guojing Yuan
785acda6d8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e4b60e48de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I966d7f664c72a5ce5234bcf7426afe38fa3d7795
2021-07-07 17:15:08 +00:00
Guojing Yuan
fbce4ec0e8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ic31e9b879e36f0a84c0b735015f8dd93207549ff
2021-07-07 17:01:30 +00:00
Guojing Yuan
e4b60e48de Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ia1d8ab6f0fd5e71545bccb67985a9186adb29ef0
2021-07-07 17:00:39 +00:00
Guojing Yuan
40dc9d519f Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev 2021-07-07 16:50:01 +00:00
ykhung
70304cff07 Add new method to get URI to monitor battery history data is updated
we will reload the database battery history data if its content is changed, which can be done through monitored the database content observer (a part of this patch cl/383366685)

Bug: 192613268
Test: make SettingsRoboTests
Change-Id: I24ab154b1dfa00ca4bf4e6f7b308f5061578bcb5
2021-07-07 16:22:37 +00:00
Bill Yi
a9f95702cd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f1183b81613d68b64ae7069a571150a634ceead
2021-07-07 15:24:28 +00:00
Marie Matheson
1d0ed65b74 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 7ec590a5a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I3be513c16a88c1cdfaa596f9963bdbcabac27f92
2021-07-07 11:57:09 +00:00
Marie Matheson
701bd282da Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 5023e5613b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ie1750933714536ce74a3ad79ed4c40e6268d6650
2021-07-07 11:56:45 +00:00
Marie Matheson
5023e5613b Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: If2147c505c13263f6799d250d70cc437ff0a1c95
2021-07-07 11:40:14 +00:00
Marie Matheson
7ec590a5a1 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
2021-07-07 11:39:18 +00:00
Marie Matheson
67c5c5a58e Merge "Move work profile security settings to bottom of list" into sc-dev 2021-07-07 11:29:22 +00:00
Edgar Wang
2a9ab203aa Adjust Seekbar layout to improve scroll ability
Fixes: 192362148
Test: visual verify
Change-Id: I0cfc7383c224846885ce9610e25364a964d78410
2021-07-07 18:11:34 +08:00
Marie Matheson
aeafb02074 Move work profile security settings to bottom of list
Bug: 192540530
Test: atest SettingsUnitTests
Test: make -j80 RunSettingsRoboTests
Test: Tested manually with and without work profile
Change-Id: I29f43202f71388c991948953c3d2c955fd32627e
2021-07-07 09:02:32 +00:00
Rubin Xu
84dda30120 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 91f11c9733
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I9583444f4c94d25e28185179fd008c8db41f35f7
2021-07-07 08:07:07 +00:00
Rubin Xu
efe2e53ba4 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783 am: 973b5cf127
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I31e4dbb192e3a78a9deb137700979b5a78ddc8cf
2021-07-07 07:58:55 +00:00
Rubin Xu
91f11c9733 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I3da274cfa41a19528df5f736093abf1f17995e8d
2021-07-07 07:50:37 +00:00
Rubin Xu
973b5cf127 Merge "Delay gargabe collection during onDestroy()" into sc-dev am: 3e84dd2783
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178137

Change-Id: I7dba6fecb8246296a02d38e27316e9256a9cd8c1
2021-07-07 07:49:43 +00:00
SongFerngWang
193f97c7ba Network selection add NGRAN when device support SA
Bug: 187148937
Test: build pass.
atest NetworkScanHelperTest (pass)

Change-Id: I1ed3eae3bda39eb702bc135b0c698f8df7c280d7
2021-07-07 15:36:42 +08:00
Rubin Xu
3e84dd2783 Merge "Delay gargabe collection during onDestroy()" into sc-dev 2021-07-07 07:29:06 +00:00
Weng Su
62560c7210 Hide the entire progress header in Internet Settings
- Hide the entire progress header to avoid showing the divider

Bug: 191968967
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I59db1c87f1088ac2d29e263a85f149ff866c435b
2021-07-07 14:19:28 +08:00
Bonian Chen
be67d3ca67 Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608 am: faf07387ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472

Change-Id: If7af800edc45e6d189dca9b1b1494c40f76b3fdf
2021-07-06 16:13:43 +00:00
Bonian Chen
2f2691216a Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608 am: 601ee61c43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472

Change-Id: I109cc8d35611b2bd08e359dee38cc74f5abb7aa0
2021-07-06 16:13:19 +00:00
Bonian Chen
601ee61c43 Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472

Change-Id: If818cd6fc162dc60c341f37299d4b13fb4dbb816
2021-07-06 15:59:19 +00:00
Bonian Chen
faf07387ef Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472

Change-Id: I9ed2d99f853eb1bfe5382b3addc50bc5d56354f7
2021-07-06 15:58:25 +00:00