Do-not-compile-QR-code-sharing.patch 7.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Thu, 27 Feb 2020 23:23:59 +0100
  3. Subject: Do not compile QR code sharing
  4. ---
  5. chrome/android/java/AndroidManifest.xml | 16 ----------------
  6. .../browser/share/ShareDelegateImpl.java | 5 -----
  7. .../browser/share/ShareSheetCoordinator.java | 16 ----------------
  8. chrome/browser/share/android/java_sources.gni | 18 ------------------
  9. 4 files changed, 55 deletions(-)
  10. diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
  11. --- a/chrome/android/java/AndroidManifest.xml
  12. +++ b/chrome/android/java/AndroidManifest.xml
  13. @@ -825,22 +825,6 @@ by a child template that "extends" this file.
  14. </intent-filter>
  15. </activity>
  16. - <activity
  17. - android:name="org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity"
  18. - android:icon="@drawable/ic_launcher"
  19. - android:label="@string/qr_code_share_icon_label"
  20. - android:enabled="false"
  21. - android:excludeFromRecents="true"
  22. - android:exported="true"
  23. - android:noHistory="true"
  24. - android:theme="@android:style/Theme.NoDisplay"
  25. - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
  26. - <intent-filter>
  27. - <action android:name="android.intent.action.SEND" />
  28. - <category android:name="android.intent.category.DEFAULT" />
  29. - <data android:mimeType="text/plain" />
  30. - </intent-filter>
  31. - </activity>
  32. <activity
  33. android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
  34. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  35. --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  36. +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
  37. @@ -20,7 +20,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  38. import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
  39. import org.chromium.chrome.browser.printing.PrintShareActivity;
  40. import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
  41. -import org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity;
  42. import org.chromium.chrome.browser.tab.SadTab;
  43. import org.chromium.chrome.browser.tab.Tab;
  44. import org.chromium.chrome.browser.tab.TabImpl;
  45. @@ -102,10 +101,6 @@ public class ShareDelegateImpl implements ShareDelegate {
  46. classesToEnable.add(SendTabToSelfShareActivity.class);
  47. }
  48. - if (QrCodeShareActivity.featureIsAvailable()) {
  49. - classesToEnable.add(QrCodeShareActivity.class);
  50. - }
  51. -
  52. if (!classesToEnable.isEmpty()) {
  53. OptionalShareTargetsManager.getInstance().enableOptionalShareActivities(activity,
  54. classesToEnable, () -> triggerShare(currentTab, shareDirectly, isIncognito));
  55. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
  56. --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
  57. +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
  58. @@ -18,7 +18,6 @@ import org.chromium.chrome.R;
  59. import org.chromium.chrome.browser.ActivityTabProvider;
  60. import org.chromium.chrome.browser.flags.ChromeFeatureList;
  61. import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
  62. -import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
  63. import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
  64. import org.chromium.chrome.browser.tab.Tab;
  65. import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
  66. @@ -161,21 +160,6 @@ public class ShareSheetCoordinator {
  67. /*isFirstParty=*/true);
  68. models.add(sttsPropertyModel);
  69. - // QR Codes
  70. - PropertyModel qrcodePropertyModel = mPropertyModelBuilder.createPropertyModel(
  71. - AppCompatResources.getDrawable(activity, R.drawable.qr_code),
  72. - activity.getResources().getString(R.string.qr_code_share_icon_label),
  73. - (currentActivity)
  74. - -> {
  75. - RecordUserAction.record("SharingHubAndroid.QRCodeSelected");
  76. - recordTimeToShare();
  77. - mBottomSheetController.hideContent(bottomSheet, true);
  78. - QrCodeCoordinator qrCodeCoordinator = new QrCodeCoordinator(activity);
  79. - qrCodeCoordinator.show();
  80. - },
  81. - /*isFirstParty=*/true);
  82. - models.add(qrcodePropertyModel);
  83. -
  84. return models;
  85. }
  86. diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
  87. --- a/chrome/browser/share/android/java_sources.gni
  88. +++ b/chrome/browser/share/android/java_sources.gni
  89. @@ -7,23 +7,5 @@
  90. share_java_sources = [
  91. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/SaveImageNotificationManager.java",
  92. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ShareImageFileUtils.java",
  93. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
  94. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
  95. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
  96. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
  97. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java",
  98. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
  99. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
  100. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
  101. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
  102. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
  103. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
  104. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
  105. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
  106. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
  107. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
  108. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
  109. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
  110. - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
  111. "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
  112. ]
  113. --
  114. 2.17.1