Commit Graph

5463 Commits

Author SHA1 Message Date
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
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
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
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
Deepanshu Gupta
e646022429 Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev 2015-05-14 04:52:59 +00:00
Keisuke Kuroyanagi
0433488daa Merge "Track difference between touch and word in x coordinate." into mnc-dev 2015-05-14 04:26:21 +00:00
Deepanshu Gupta
5987e553c2 Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit c73a1aaa90. The change
causes an NPE when rendering ListViews.
2015-05-13 21:25:57 -07:00
Dan Sandler
a22a380fbb Add Icon support to ImageView.
ImageView.setImageIcon() is remotable, so you can also call
RemoteViews.setImageViewIcon().

Bug: 18568715
Change-Id: I456cfa65102e1983d3392d822584d154a6cd761a
2015-05-13 23:50:39 -04:00
Alan Viverette
a9bc2c0fee am b0b80305: am c6b6dd84: am bf6d50f9: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
* commit 'b0b80305ab127828aec1c6df080d5e1fbd0ad6da':
  Call dispatchFinishTemporaryDetach before returning a transient view
2015-05-14 01:00:51 +00:00
Alan Viverette
bf6d50f906 Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 2015-05-13 23:35:55 +00:00
Keisuke Kuroyanagi
0138e4c7f8 Track difference between touch and word in x coordinate.
After a handle is snapped to the word, the difference was
tracked in offset. It can break grapheme clusters, ignores
character width, and makes it difficult to select text near
line breaks.

Bug: 21005599
Change-Id: I42402a377670c7e3c6d6e6583744d085ae52bba2
2015-05-13 16:28:29 -07:00
Mady Mellor
56ce4f6a18 am 15398fae: am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
* commit '15398faeb0482c39075718d70f065ff33d01a2ce':
  Fix issue where handle is in front of word rather than end of word
2015-05-13 18:05:27 +00:00
Mady Mellor
21623faa44 Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 2015-05-13 17:34:13 +00:00
Mady Mellor
2e577d2e1c Fix difficulty grabbing handles for small selections
The gravity for the handles pushes them to the outside of the touch target
square, causing the touch target to overlap for both of them when close
together. This CL swaps the gravity so that the touch target does not
overlap when the handles are close.

Bug: 20065564
Change-Id: I4d14e7076ac779c5f4a0a603d6348ba6dc7c7b4c
2015-05-13 07:15:17 -07:00
Roozbeh Pournader
35a85ab057 am e652d17b: am 703b5078: am 0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev
* commit 'e652d17b3e8af3c4e8e3355cca864e61aad0dc35':
  Add hyphenationFrequency attribute to TextView and StaticLayout.
2015-05-12 23:37:51 +00:00
Roozbeh Pournader
0ca0f58000 Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev 2015-05-12 22:59:47 +00:00