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

Commit f788a9fc authored by Gilles Debunne's avatar Gilles Debunne
Browse files

TextView with Selection Contextual Mode 

Context menu entries have been moved to a contextual mode in the action bar.

Change Input Method has been removed and *should be added to the system bar instead*.

Add word to dictionnary has also been removed and should now be done using the suggestioni
bar "tap on word to add" feature.

Change-Id: I767373f53515b2d6a06500321b4b12ed0b05a9b6
parent 04839151

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -14812,6 +14812,17 @@ 
 visibility="public"

>

</field>

<field name="selectTextMode"

 type="int"

 transient="false"

 volatile="false"

 value="16908354"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="selectedIcon"

 type="int"

 transient="false"
@@ -15931,6 +15942,17 @@ 
 visibility="public"

>

</field>

<field name="selectTextMode"

 type="int"

 transient="false"

 volatile="false"

 value="17039408"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="unknownName"

 type="int"

 transient="false"

core/java/android/view/View.java

+7 −4
Original line number Diff line number Diff line
@@ -2510,11 +2510,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
    }



    /**

     * Call this view's OnLongClickListener, if it is defined. Invokes the context menu

     * if the OnLongClickListener did not consume the event.

     * Call this view's OnLongClickListener, if it is defined. Invokes the context menu if the

     * OnLongClickListener did not consume the event.

     *

     * @return True there was an assigned OnLongClickListener that was called, false

     *         otherwise is returned.

     * @return True if one of the above receivers consumed the event, false otherwise.

     */

    public boolean performLongClick() {

        sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
@@ -4359,6 +4358,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Show the context menu for this view. It is not safe to hold on to the

     * menu after returning from this method.

     *

     * You should normally not overload this method. Overload

     * {@link #onCreateContextMenu(ContextMenu)} or define an

     * {@link OnCreateContextMenuListener} to add items to the context menu.

     *

     * @param menu The context menu to populate

     */

    public void createContextMenu(ContextMenu menu) {

core/java/android/widget/TextView.java

+427 −342

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
  <item type="id" name="copy" />

  <item type="id" name="paste" />

  <item type="id" name="copyUrl" />

  <item type="id" name="selectTextMode" />

  <item type="id" name="switchInputMethod" />

  <item type="id" name="keyboardView" />

  <item type="id" name="closeButton" />

core/res/res/values/public.xml

+5 −1
Original line number Diff line number Diff line
@@ -1311,6 +1311,9 @@ 
  <public type="attr" name="windowActionModeOverlay" />



  <public type="id" name="home" />

  <!-- Context menu ID for the "Select text..." menu item to switch to text

       selection context mode in text views. -->

  <public type="id" name="selectTextMode" />



  <public type="style" name="Theme.WithActionBar" />

  <public type="style" name="Widget.Spinner.DropDown" />
@@ -1324,4 +1327,5 @@ 
       the base class. -->

  <public type="layout" name="list_content" />



  <public type="string" name="selectTextMode" id="0x01040030" />

</resources>