Commit Graph

85697 Commits

Author SHA1 Message Date
TreeHugger Robot
000c323f8e Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 70edc357a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ie31f291ae79fcbb2c8b108cb269ba030e6d36d32
2021-07-09 08:36:39 +00:00
TreeHugger Robot
bdbbadf046 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 7cbff10736
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ia6407c21cb162fcc32f2891ae4e548f9b1a10896
2021-07-09 08:36:16 +00:00
TreeHugger Robot
7cbff10736 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: I706d0ad598acd587e616903a9242c10c29078ab8
2021-07-09 08:23:35 +00:00
TreeHugger Robot
70edc357a9 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: I84efecbce455f3d0879db85b7a313ae1d0a14367
2021-07-09 08:22:13 +00:00
TreeHugger Robot
b4dccf9b8e Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev 2021-07-09 08:07:37 +00:00
YUKAI HUNG
04dc2ec138 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev am: a1e610b689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15236915

Change-Id: I8c8c63740bb1e7c270bea039ceaad4939ec8420d
2021-07-09 06:56:09 +00:00
YUKAI HUNG
a1e610b689 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev 2021-07-09 06:43:14 +00:00
ykhung
b6d95d1c4f Remove items from not allowed show summary list (legacy rule)
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ieadc97eddcbd149e04ec85477859a9b3ffd8f06b
2021-07-09 11:13:26 +08:00
Hugh Chen
112a638cba Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"
Before this CL, the USB option didn't handle whether FUNCTION_NCM
existed in the intent extra when tethering was started which resulted
in some devices that enable NCM will have incorrect UI.

This CL added a condition to check whether FUNCTION_NCM existed in the
intent extra or not to fix this UI issue.

Bug: 192046902
Test: make -j42 RunSettingsRoboTests
Change-Id: Icb8548409930d59dc3a08c25e418c9a1ddb9f33c
2021-07-09 10:52:50 +08:00
TreeHugger Robot
c7fe39e102 Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-v2-dev am: 550187d84b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15229962

Change-Id: Ic7c04f4cb93ebed1aeae86dc651d68577123721c
2021-07-08 22:46:13 +00:00
TreeHugger Robot
550187d84b Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-v2-dev 2021-07-08 22:32:13 +00:00
Pyuli Naithani
165a31f4bb Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306 am: 8ca543ca17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

Change-Id: Id6056db94c6405c6ab20c3be328386c3f6f9bb63
2021-07-08 17:51:52 +00:00
Pyuli Naithani
0c6cfcfb55 Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306 am: c84cc4e1fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

Change-Id: I0b2b3f4d1aad8c426d20126ad70863cacad55652
2021-07-08 17:39:33 +00:00
TreeHugger Robot
a6771463a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours am: 3f8a5c0654 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id8371f13d9ebb62bf397ba90c7c2c3ba5fbc1304
2021-07-08 17:37:54 +00:00
TreeHugger Robot
0394cdf673 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours am: 41a3cd3a66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifde9fad325f4b40600e5c9e1bfa43da055044027
2021-07-08 17:37:33 +00:00
Pyuli Naithani
8ca543ca17 Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

Change-Id: I9121f7f700154679bf0320b3d0fa43430966b4aa
2021-07-08 17:31:21 +00:00
Pyuli Naithani
c84cc4e1fe Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

Change-Id: Id5b83cb13834554406fccbc6bf712981eaef404b
2021-07-08 17:28:52 +00:00
TreeHugger Robot
41a3cd3a66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia700df4efedef16ba81d09fe9ce5bff46dd3d4ef
2021-07-08 17:25:11 +00:00
Pyuli Naithani
c0302ab306 Merge "Add stats log for sensor privacy." into sc-dev 2021-07-08 17:24:52 +00:00
TreeHugger Robot
3f8a5c0654 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia324b3215c09ed3e71542f261ab0ad591d74fd7b
2021-07-08 17:22:54 +00:00
TreeHugger Robot
a3be4c89a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-08 17:07:06 +00:00
ykhung
d76c12f69c Include new "dex2oat64" process to map into App Optimization name
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ib392ed3adf7fe37fdaf73076dd1c3cd8361468eb
2021-07-09 00:19:31 +08:00
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
Bill Yi
7c2a910199 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2045140919e5d3829713eac17d2a3d313f1e3022
2021-07-08 15:35:59 +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