Commit Graph

91880 Commits

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

Change-Id: I11543bd216c3306224e045ec7fdc786f9a7786e2
2021-07-09 08:54:56 +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
40785a0bd7 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: d6dbc7a944
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ie4d9b008ac21e51d99f4f5baf8c1f1bae565e09a
2021-07-09 08:35:51 +00:00
Betty Chang
3b725057fb Merge "Remove some attributes to move the dialog window up" 2021-07-09 08:31:11 +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
d6dbc7a944 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: Ib9c441b2cef7078026877f57cef96ef9d072b086
2021-07-09 08:22:41 +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
da6dd6e630 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev am: a1e610b689 am: 04dc2ec138
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15236915

Change-Id: I8727082a70f36d9ca172386b7446c56ee50d8765
2021-07-09 07:11:55 +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
changbetty
cfb994c644 Remove some attributes to move the dialog window up
Bug: 192815830
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test
Change-Id: Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7
2021-07-09 03:59: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
172e8d0341 Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-v2-dev am: 550187d84b am: c7fe39e102
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15229962

Change-Id: Idfcee2bc4834280b7c578d29d838d773957a7670
2021-07-08 23:00:12 +00: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
815b6123cd Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306 am: 8ca543ca17 am: 165a31f4bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

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

Change-Id: I92001c5de73fed48d0e7708223005a3cb5a9869c
2021-07-08 17:56:29 +00:00
TreeHugger Robot
7fc797b744 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours am: 3f8a5c0654 -s ours am: a6771463a8 -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: Iada6f5c22eaf53caf9924846174a4e440cbe7144
2021-07-08 17:55:00 +00:00
Automerger Merge Worker
41a392f07f Merge "Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306 am: 00fbe6e502" 2021-07-08 17:54:38 +00:00
TreeHugger Robot
071152d5bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours am: 41a3cd3a66 -s ours am: 0394cdf673 -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: I7c695472e96fcc3a10efcca21eb8f030218c0365
2021-07-08 17:54:21 +00:00
Pyuli Naithani
df5a3d813c Merge "Add stats log for sensor privacy." into sc-dev am: c0302ab306 am: 00fbe6e502
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15193345

Change-Id: I66b0759e95f3089706890cbe160c5416bd1b54cd
2021-07-08 17:54:08 +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
TreeHugger Robot
5de834d410 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a3be4c89a5 -s ours am: 369123f8b8 -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: Ie72b17784f118cf1687a6afc369010334d147008
2021-07-08 17:36:59 +00:00
Pyuli Naithani
00fbe6e502 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: I3a122480f1faa5f17e6ec86cde452b6bac63e3e9
2021-07-08 17:32:21 +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
369123f8b8 [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: Iba4ed120d7ae4bfa1e1b5a3c1b7f835f9b471588
2021-07-08 17:24:10 +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
c41c7a6071 Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a am: 7cd80a4304 am: 7e42912c2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

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

Change-Id: I3d31497631b21a421e153e4c589fcf02a8002ab8
2021-07-08 15:56:29 +00: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
b050738605 Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a am: 06a1f62fa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15215910

Change-Id: I16dad8c8189cdcf716d0aef4ffbadc29348f9fb8
2021-07-08 15:47:50 +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
06a1f62fa8 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: I6ef2d6ded9126c95fc50aba012de0abaa0210204
2021-07-08 15:35:41 +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
9b45a0eb02 Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 9f06b36b3b am: bea3b02606
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

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

Change-Id: Iff59ecd69c3a5dd976eec6400e5a1cb3b2042b77
2021-07-08 09:24:55 +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