Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 054dc467 authored by Dipen Pradhan's avatar Dipen Pradhan Committed by Automerger Merge Worker
Browse files

Merge "Add config for "Share" action in TextView context menu" into udc-qpr-dev am: fa904197 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23820097



Change-Id: Idf05bf34f94e798c543c9bd80b7ad78c30031d65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86835882 fa904197

core/java/android/widget/TextView.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -14994,7 +14994,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }

    }

















    boolean canShare() {







    boolean canShare() {











        if (!getContext().canStartActivityForResult() || !isDeviceProvisioned()) {







        if (!getContext().canStartActivityForResult() || !isDeviceProvisioned()














                || !getContext().getResources().getBoolean(














                com.android.internal.R.bool.config_textShareSupported)) {











            return false;







            return false;











        }







        }











        return canCopy();







        return canCopy();

























core/res/res/values/config.xml



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -6557,4 +6557,8 @@









         environment to protect the user's privacy when the device is being repaired.







         environment to protect the user's privacy when the device is being repaired.











         Off by default, since OEMs may have had a similar feature on their devices. -->







         Off by default, since OEMs may have had a similar feature on their devices. -->











    <bool name="config_repairModeSupported">false</bool>







    <bool name="config_repairModeSupported">false</bool>





























    <!-- Enables or disables the "Share" action item shown in the context menu that appears upon














        long-pressing on selected text. Enabled by default. -->














    <bool name="config_textShareSupported">true</bool>











</resources>






</resources>
























core/res/res/values/symbols.xml



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -3047,6 +3047,7 @@









  <java-symbol type="id" name="addToDictionaryButton" />







  <java-symbol type="id" name="addToDictionaryButton" />











  <java-symbol type="id" name="deleteButton" />







  <java-symbol type="id" name="deleteButton" />











  <!-- TextView -->







  <!-- TextView -->














  <java-symbol type="bool" name="config_textShareSupported" />











  <java-symbol type="string" name="failed_to_copy_to_clipboard" />







  <java-symbol type="string" name="failed_to_copy_to_clipboard" />































  <java-symbol type="id" name="notification_material_reply_container" />







  <java-symbol type="id" name="notification_material_reply_container" />