Commit Graph

5475 Commits

Author SHA1 Message Date
Keisuke Kuroyanagi
81df2aa26d am b5329008: am 3e7965f7: am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit 'b53290085ad044bfe7e24e08a1ef6c636913cc24':
  Fix: Insertion handle can be moved just by tapping.
2015-05-22 16:52:16 +00:00
Keisuke Kuroyanagi
1733bd3def Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 2015-05-22 02:28:26 +00:00
Keisuke Kuroyanagi
7c1b0e0e62 am 2c9bb079: am 56692dd7: am 27a63612: Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
* commit '2c9bb079e7457fff39766e50240cc8af965ff3fb':
  Fix: Crash when modifying text while using drag accelerator.
2015-05-21 15:57:33 +00:00
Keisuke Kuroyanagi
27a6361234 Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev 2015-05-21 04:07:57 +00:00
Mady Mellor
7367c7f074 am 1f25f1d7: am 46b70388: am b300d31b: Merge "Text selection: fix some issues with drag accelerator" into mnc-dev
* commit '1f25f1d75def8c7c65aff516a3a24c4ac3bf3fb2':
  Text selection: fix some issues with drag accelerator
2015-05-20 18:54:35 +00:00
Mady Mellor
eba9505c16 am b340eecd: am 88b07740: am 3244a663: Merge "Fix selection handles on older API versions" into mnc-dev
* commit 'b340eecd7d8a59c9a87e39df8ce7bf7455b62239':
  Fix selection handles on older API versions
2015-05-20 18:09:11 +00:00
Mady Mellor
b300d31bf1 Merge "Text selection: fix some issues with drag accelerator" into mnc-dev 2015-05-20 18:05:32 +00:00
Mady Mellor
3244a66336 Merge "Fix selection handles on older API versions" into mnc-dev 2015-05-20 17:09:13 +00:00
Mady Mellor
7a93644d5e Text selection: fix some issues with drag accelerator
Couple of overlapping issues that this CL fixes. The major change is to
offset the selection vertically this is similar to how the handles work
already (i.e. touch target is below what's being selected), and still
allows the user to see the selection start / end without covering it with
their finger.

This change fixes multiple issues:
1) Previously to ensure the finger wasn't covering the selection a
   preceding or following offset was taken, this made it difficult to
   select certain words and it made text on the edge of the screen hard
   to select (b/21098345 and b/19965619)
2) The use of preceding and following on the word iterator was not correct
   allowing grapheme clusters to be split, now the offset is calculated
   with getWordStart/End which respect grapheme clusters (b/21045116)

Bug: 21098345
Bug: 21045116
Bug: 19965619
Change-Id: Id8392426cce20ad0ff47a4279c92f6ed1b0ad30e
2015-05-20 10:05:52 -07:00
Andrei Stingaceanu
05b0e67767 am a53349dd: am 886e9478: am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev
* commit 'a53349dd55cdd7592e28bc51e71c7111340337f8':
  Landscape extracted mode - floating toolbar interference
2015-05-20 13:17:58 +00:00
Andrei Stingaceanu
8c44e74524 Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 2015-05-20 09:32:50 +00:00
Andrei Stingaceanu
975a8d0f4d Landscape extracted mode - floating toolbar interference
In landscape do not allow starting selection modes if the
extracted mode has not yet started. Also remove the single
tap selection delayed runnable.

This allows for a smooth transition (as in no floating
toolbar artifacts) into extracted mode. Also fixes
(more as in hides) the double selections.

Bug: 20930071
Change-Id: Idb9c375dc25777761b11ca17ccfd9f5eedc642b4
2015-05-20 10:31:19 +01:00
Abodunrinwa Toki
bd007bd0d3 am 56546bd8: am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
* commit '56546bd8838dd6792dd7296df4263bb1c7796ec9':
  Hide floating toolbar when user interacts with screen.
2015-05-19 14:40:44 +00:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
2015-05-19 14:25:39 +01:00
Clara Bayarri
d58ab0a474 am f11210a3: am 9053af6f: am e94561ec: Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
* commit 'f11210a36cc2550c65dd891c2ddb749f412df816':
  Fix Cancelling a text action activity deletes the selected text
2015-05-19 11:19:40 +00:00
Clara Bayarri
e94561ecbc Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev 2015-05-19 10:42:20 +00:00
Keisuke Kuroyanagi
bc89a5ce34 Fix: Insertion handle can be moved just by tapping.
Horizontal poistion is passed to updatePosition() without
adding getHorizontalOffset(). The position is wrong for the
insertion handle; thus, the handle is moved just by tapping
on it.

Bug: 20923263
Change-Id: Ie867ebd9e6b682057b73373fefb7b2baf45caef9
2015-05-18 14:49:29 +09:00
Keisuke Kuroyanagi
7127bfe92f am 7af748f2: am 4fddad17: am e20b22fe: Merge "Fix: Drag handle isn\'t updated after crossing bidi boundary." into mnc-dev
* commit '7af748f2a5348ed50c5325feef46c5a67a27efb9':
  Fix: Drag handle isn't updated after crossing bidi boundary.
2015-05-18 05:30:57 +00:00
Keisuke Kuroyanagi
259292ff3d Fix: Crash when modifying text while using drag accelerator.
Drag accelerator state was not cleared when the text was
modified; thus, mStartOffset could point to an invalid offset.

Bug: 21178876
Change-Id: Ic9b47375bab321fbc573e8a81e3fadf60309da78
2015-05-18 14:15:32 +09:00
Keisuke Kuroyanagi
e20b22feb3 Merge "Fix: Drag handle isn't updated after crossing bidi boundary." into mnc-dev 2015-05-18 04:57:09 +00:00
Keisuke Kuroyanagi
33f81ac108 Fix: Drag handle isn't updated after crossing bidi boundary.
mDrawable is updated, but it was not re-drawn properly.
postInvalidate() should be called when the drawable is
updated.

Bug: 21141841
Change-Id: Icb3ddf18d05285ffa8758a9be256482d594ab8ed
2015-05-18 13:56:06 +09:00
Alan Viverette
0164bba2f8 am d03ed00c: am b50a8b97: am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
* commit 'd03ed00c6761d20a3581c133d8cf639c03b4d889':
  Return correct year in DayPickerPagerAdapter.getYearForPosition()
2015-05-15 22:59:47 +00:00
Mady Mellor
709386f501 Fix selection handles on older API versions
The new assets didn't have the same padding on the edges as assets on older
versions. The adjustments to the getHotspotX code for the new assets broke
how the handles on older API versions were placed.

This CL updates the assets to have the same padding (i.e. handleWidth / 2
on each side of the handle and changes the getHotspotX methods for this.

Bug: 20829391
Change-Id: If7e466d200ef7757831bc763c3c3ce4a8bbf63fc
2015-05-15 15:51:47 -07:00
Alan Viverette
bd51b4d0b9 Return correct year in DayPickerPagerAdapter.getYearForPosition()
Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.

Bug: 21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5
2015-05-15 14:18:44 -07:00
Mady Mellor
25a339103c am 2016f97d: am e0b108cd: am 21417a0d: Merge "Text selection: Fix moving by character when should move by word" into mnc-dev
* commit '2016f97d481c7bdf85a7f4ecccb79dbafd0da325':
  Text selection: Fix moving by character when should move by word
2015-05-15 20:27:55 +00:00
Mady Mellor
de6b408b87 am 5679d2c3: am 976c683b: am c25d6c22: Merge "Fix difficulty grabbing handles for small selections" into mnc-dev
* commit '5679d2c33431ad365db76fc2b380a5992213b7c9':
  Fix difficulty grabbing handles for small selections
2015-05-15 20:27:51 +00:00
Mady Mellor
21417a0d50 Merge "Text selection: Fix moving by character when should move by word" into mnc-dev 2015-05-15 17:56:59 +00:00
Mady Mellor
c25d6c22bb Merge "Fix difficulty grabbing handles for small selections" into mnc-dev 2015-05-15 17:56:57 +00:00
Alan Viverette
64b7675c7a am 961e1304: am 8b51ce7d: am 617da41e: Merge "Update button visibility as a final step in DayPickerView construction" into mnc-dev
* commit '961e1304b915896efc75553980aa7e2675ad1743':
  Update button visibility as a final step in DayPickerView construction
2015-05-15 17:06:01 +00:00
Alan Viverette
617da41e8c Merge "Update button visibility as a final step in DayPickerView construction" into mnc-dev 2015-05-15 16:44:23 +00:00
Clara Bayarri
5b7665a1f2 Fix Cancelling a text action activity deletes the selected text
The implementation of onActivityResult in TextView did not check the
result code, hence treating the cancelled activity result as a
replacement by empty text.

Also added tests to catch this case and basic usage.

Bug: 21183019
Change-Id: Ibdafe89474dd69c5b70c67ec98fed46656f9fdcf
2015-05-15 16:32:50 +01:00
Andrei Stingaceanu
ad91a1d780 am ed146a96: am c2bdee59: am d674f230: Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
* commit 'ed146a96073ce2bbed2850c37fab46985358f259':
  Editor: enable double tap for selection after cut/copy.
2015-05-14 21:25:09 +00:00
Alan Viverette
b12172ef47 Update button visibility as a final step in DayPickerView construction
Previously it was only updated when the page was turned, but that listener
isn't called until the user turns the page.

Bug: 20701637
Change-Id: I06faf59660cda0e19d57766f4afd141e4a389b18
2015-05-14 14:24:36 -07:00
Andrei Stingaceanu
f979f5f457 am fcd68d34: am 6f885d1b: am fa660f79: Merge "Fix: text selection bubbles move along with the text" into mnc-dev
* commit 'fcd68d3487c7a5e3f6198ddfb9b9794c28eb7ef9':
  Fix: text selection bubbles move along with the text
2015-05-14 21:23:35 +00:00
Wojciech Staszkiewicz
b41aab7b5c am b8ee07d1: am e2ad30ef: am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
* commit 'b8ee07d10c8a8494cb658c3bc3f58f404b949db6':
  Pass charset to XmlPullParser.setInput instead of null
2015-05-14 21:23:12 +00:00
Andrei Stingaceanu
6d9d9d1cb3 am c84dfea8: am dee1479c: am c398adf8: Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev
* commit 'c84dfea8f9c204edf3d2e5469a2538da88e159b2':
  Fix floating toolbar popping frequently after Replace/Copy
2015-05-14 21:23:02 +00:00
Andrei Stingaceanu
ecb7de8ee9 am 1496cdd0: am 46044e85: am 78e2f07e: Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev
* commit '1496cdd09d210d3f9533ee5857f44f719fe9c2e3':
  Fix: replace terminates extract mode (floating toolbar)
2015-05-14 18:05:03 +00:00
Chris Banes
384f836de3 am 9637545a: am dc6125d4: am 18ee0524: Merge "Fix build; doc link in ImageView" into mnc-dev
* commit '9637545abedc911e4445837afac2a4bf5eddfbe3':
  Fix build; doc link in ImageView
2015-05-14 18:04:57 +00:00
Mady Mellor
81fa3e8966 Text selection: Fix moving by character when should move by word
The code to restrict handles from crossing did not respect moving by
word or by character. This CL checks the offset to see if it's crossing,
and if it is, it restricts it to the line of the other handle and proceeds
with determining the "actual" offset based on the activated
mode by word / by char).

There is also still a check to ensure that one character is selected
after the mode as adjusted the offset.

Bug: 21114827
Change-Id: Idac699ef2eb5d313e77d44b5064c03ff84e0fb88
2015-05-14 09:22:59 -07:00
Andrei Stingaceanu
fae270c108 Editor: enable double tap for selection after cut/copy.
* detect double tap in the TextView and pass it to Editor.
* add a timer (with getDoubleTapTimeout) for executing the
  single tap job in Editor.
* if double tap is detected then cancel the single tap job.

This way one tap shows the toolbar if within the timeframe
and two taps select the word and show the toolbar.

Bug: 20442587
Change-Id: I0a117939c896fcb13669346e30c9c48d319576dd
2015-05-14 16:11:07 +01:00
Andrei Stingaceanu
35c550c854 Fix: text selection bubbles move along with the text
Always hide the selection cursor when showing the
insertion cursor.

Bug: 19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
2015-05-14 14:30:18 +01:00
Wojciech Staszkiewicz
be752b1f28 Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 2015-05-14 10:27:24 +00:00
Andrei Stingaceanu
c398adf81c Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev 2015-05-14 10:23:09 +00:00
Andrei Stingaceanu
78e2f07e81 Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev 2015-05-14 09:33:58 +00:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Chris Banes
e695bb8a28 Fix build; doc link in ImageView
Change-Id: Ie3057fc2b920f71ff89eee0d3577d21d0e9930c3
2015-05-14 10:12:20 +01:00
Deepanshu Gupta
d47e576df5 am da3fb48c: am 70854ba9: am e6460224: Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev
* commit 'da3fb48c8afacc4da5ffb2cd01c0c9c201d40cfc':
  Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
2015-05-14 06:55:49 +00:00
Keisuke Kuroyanagi
3a63706917 am 57f3e109: am 5c43d546: am 0433488d: Merge "Track difference between touch and word in x coordinate." into mnc-dev
* commit '57f3e109b2929b4f7992b0ea012e90e6f47f7a9e':
  Track difference between touch and word in x coordinate.
2015-05-14 06:55:06 +00:00
Dan Sandler
d91129003c am 38b00300: am 96952c74: am a22a380f: Add Icon support to ImageView.
* commit '38b003001ace5ddc354b483dc37793c3ceeaf34b':
  Add Icon support to ImageView.
2015-05-14 06:54:54 +00:00