123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122 |
- From: csagan5 <32685696+csagan5@users.noreply.github.com>
- Date: Thu, 27 Feb 2020 23:23:59 +0100
- Subject: Do not compile QR code sharing
- ---
- chrome/android/java/AndroidManifest.xml | 16 ----------------
- .../browser/share/ShareDelegateImpl.java | 5 -----
- .../browser/share/ShareSheetCoordinator.java | 16 ----------------
- chrome/browser/share/android/java_sources.gni | 18 ------------------
- 4 files changed, 55 deletions(-)
- diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
- --- a/chrome/android/java/AndroidManifest.xml
- +++ b/chrome/android/java/AndroidManifest.xml
- @@ -825,22 +825,6 @@ by a child template that "extends" this file.
- </intent-filter>
- </activity>
-
- - <activity
- - android:name="org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity"
- - android:icon="@drawable/ic_launcher"
- - android:label="@string/qr_code_share_icon_label"
- - android:enabled="false"
- - android:excludeFromRecents="true"
- - android:exported="true"
- - android:noHistory="true"
- - android:theme="@android:style/Theme.NoDisplay"
- - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
- - <intent-filter>
- - <action android:name="android.intent.action.SEND" />
- - <category android:name="android.intent.category.DEFAULT" />
- - <data android:mimeType="text/plain" />
- - </intent-filter>
- - </activity>
-
- <activity
- android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
- 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
- --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
- @@ -20,7 +20,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
- import org.chromium.chrome.browser.printing.PrintShareActivity;
- import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
- -import org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity;
- import org.chromium.chrome.browser.tab.SadTab;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabImpl;
- @@ -102,10 +101,6 @@ public class ShareDelegateImpl implements ShareDelegate {
- classesToEnable.add(SendTabToSelfShareActivity.class);
- }
-
- - if (QrCodeShareActivity.featureIsAvailable()) {
- - classesToEnable.add(QrCodeShareActivity.class);
- - }
- -
- if (!classesToEnable.isEmpty()) {
- OptionalShareTargetsManager.getInstance().enableOptionalShareActivities(activity,
- classesToEnable, () -> triggerShare(currentTab, shareDirectly, isIncognito));
- 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
- --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
- @@ -18,7 +18,6 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ActivityTabProvider;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
- -import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
- import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
- @@ -161,21 +160,6 @@ public class ShareSheetCoordinator {
- /*isFirstParty=*/true);
- models.add(sttsPropertyModel);
-
- - // QR Codes
- - PropertyModel qrcodePropertyModel = mPropertyModelBuilder.createPropertyModel(
- - AppCompatResources.getDrawable(activity, R.drawable.qr_code),
- - activity.getResources().getString(R.string.qr_code_share_icon_label),
- - (currentActivity)
- - -> {
- - RecordUserAction.record("SharingHubAndroid.QRCodeSelected");
- - recordTimeToShare();
- - mBottomSheetController.hideContent(bottomSheet, true);
- - QrCodeCoordinator qrCodeCoordinator = new QrCodeCoordinator(activity);
- - qrCodeCoordinator.show();
- - },
- - /*isFirstParty=*/true);
- - models.add(qrcodePropertyModel);
- -
- return models;
- }
-
- diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
- --- a/chrome/browser/share/android/java_sources.gni
- +++ b/chrome/browser/share/android/java_sources.gni
- @@ -7,23 +7,5 @@
- share_java_sources = [
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/SaveImageNotificationManager.java",
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ShareImageFileUtils.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
- - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
- ]
- --
- 2.17.1
|