Commit Graph

52818 Commits

Author SHA1 Message Date
Raph Levien
7f374287c4 am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev
* commit '85e9092decddc5a0da43ecbd22ef2d3292daca4d':
  Rename setTextDir to setTextDirection
2015-06-03 23:32:17 +00:00
Adam Powell
a115bffa1e am 93d3a94b: am cd45913f: Merge "Fix view foreground tinting" into mnc-dev
* commit '93d3a94bcae201236922c0caed54b5c90a2e736d':
  Fix view foreground tinting
2015-06-03 23:20:10 +00:00
Svetoslav
3f8a2f73ec am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev
* commit '21ec5f6256794755abee83c4daf8737f2ff30e10':
  Adding missing permission API to fragment
2015-06-03 23:20:05 +00:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Clara Bayarri
3341fa5349 am 79c389de: am eb665337: Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev
* commit '79c389de922d871d4fd96093b6715e6b9bfad778':
  Fix Floating tool bar covers text during long press + drag
2015-06-03 22:58:30 +00:00
Adam Powell
cd45913fe3 Merge "Fix view foreground tinting" into mnc-dev 2015-06-03 22:54:00 +00:00
Svetoslav
597059d535 Merge "Adding missing permission API to fragment" into mnc-dev 2015-06-03 22:44:48 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
2015-06-03 15:43:59 -07:00
Clara Bayarri
eb66533716 Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 2015-06-03 22:33:59 +00:00
Adam Powell
cec5f733f5 Fix view foreground tinting
Copy and paste is bad, mmkay?

Bug 21209639

Change-Id: I6c17e8a30fad6d5110f18e4723a5f5e6ddb814b8
2015-06-03 15:26:51 -07:00
Mady Mellor
a28b60217a am a80a8025: am 95753e2f: Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev
* commit 'a80a802505ec1fbd67f8136406074ed883f6e3dc':
  Ensure to reset state of selecting by word/char for new selections
2015-06-03 21:43:26 +00:00
James Cook
72921131d9 am 9a0f4bd4: am 8fd48ca3: Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev
* commit '9a0f4bd44ebb8cd1f922bb27f8de384937b24255':
  Fix TabHost stealing focus on hardware keyboard keypress
2015-06-03 21:24:55 +00:00
Mady Mellor
95753e2f4b Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 2015-06-03 21:15:19 +00:00
Clara Bayarri
dfac443516 Fix Floating tool bar covers text during long press + drag
The existing implementation started the ActionMode even when knowing
a drag would start. Moved this logic to once the drag is complete,
to avoid the toolbar popping up while the user is still dragging.

Since the existing method selected the initial word when no other
selection existed, refactored that logic so it is also performed at
the start of the drag. Otherwise, the user sees no selection until
he drags over 2 or more words.

Bug: 21144634

Change-Id: I97cf89b1c4c3ebdbbd1af50bd1ce5aa4af72164b
2015-06-03 22:06:55 +01:00
James Cook
8fd48ca377 Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 2015-06-03 20:58:52 +00:00
Raph Levien
a6a082862b Rename setTextDir to setTextDirection
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.

Bug: 21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
2015-06-03 13:20:45 -07:00
Adam Powell
93925483f3 am cb3b67f4: am c52e0d90: Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev
* commit 'cb3b67f404c97c799233f04c91726e2febc66f5e':
  Properly restore RTL state in HorizontalScrollView
2015-06-03 20:10:20 +00:00
Mady Mellor
36d5a7b225 Ensure to reset state of selecting by word/char for new selections
Previously this value was only updated when interacting with the
selection handles, so if you started a selection, entered by-char mode,
and then started another selection you would still be in by-char mode.
This resulted in incorrect behavior.

This CL alters the logic to update the handle state whenever the cursor
is placed which will included the initial long press to select a word.

Bug: 21301589
Change-Id: I15dbe6f2b76c7edd8ea4b3ba53e7107c47bc48fa
2015-06-03 19:53:52 +00:00
Adam Powell
c52e0d900c Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev 2015-06-03 19:52:26 +00:00
Dmitriy Ivanov
ba429fc6e9 am d04af00b: am 77f55c5c: Merge "Fix build" into mnc-dev
* commit 'd04af00b1ef028459a1f9a3740d08ba453ee6ae8':
  Fix build
2015-06-03 19:45:59 +00:00
Dmitriy Ivanov
bac9576928 Fix build
Bug: 21602590
Change-Id: Iffb9a7b74dc97bf30aea2014b0e3d2a96097291b
2015-06-03 19:18:59 +00:00
Svetoslav
c61aa888b9 am 68631f0a: am afa9e99c: Merge "Fix finding views by accessibility id." into mnc-dev
* commit '68631f0aae5e410dabd65a5e17c3a4a898b7aea1':
  Fix finding views by accessibility id.
2015-06-03 19:18:36 +00:00
Alan Viverette
88bba269c6 am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
* commit 'd425e2d7204fbab1ac1c33fa6f2cd9d557654142':
  Call dispatchFinishTemporaryDetach before returning a transient view
2015-06-03 19:18:26 +00:00
Jonathan Basseri
5257e92f26 am f28ab7a7: am f270a8f3: Fix logic error in CarrierService.
* commit 'f28ab7a75b87eede9a051b736b79cc9d598219a1':
  Fix logic error in CarrierService.
2015-06-03 19:18:11 +00:00
Jonathan Basseri
4b97a3fe01 am cc00587c: am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev
* commit 'cc00587c04f853d7c85c78893462c0f43781f17d':
  Fix logic error in CarrierService.
2015-06-03 19:18:06 +00:00
Filip Gruszczynski
3dc18c5788 am da992dee: am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
* commit 'da992deeb8413f84cc978f615272dd3ff6ef61a2':
  Fix NPE when requesting outsets for detached view.
2015-06-03 18:49:18 +00:00
Abodunrinwa Toki
60416891d2 am 24a28fa6: am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev
* commit '24a28fa62919a82ced1371ea7fdc6c1091bb0273':
  Fix FloatingToolbar positioning for RTL.
2015-06-03 18:49:09 +00:00
Yohei Yukawa
fd417eb405 am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
* commit '5acad9323ad656977ca0d10fd4ebe5f4a661e8e4':
  Convert subtypes whose locale is "tl" to "fil".
2015-06-03 18:49:04 +00:00
Alex Klyubin
38012dba5c am 0623bc8a: am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit '0623bc8ae2903ea49590b127a04c3c3952655aed':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-03 18:48:58 +00:00
Alex Klyubin
b4f06ff335 am 0643449d: am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit '0643449dc645cdbc25f8abba0500ecfd16cd7dc7':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-03 18:47:31 +00:00
Svetoslav
afa9e99c88 Merge "Fix finding views by accessibility id." into mnc-dev 2015-06-03 18:46:07 +00:00
Svetoslav
6cc4627d88 Fix finding views by accessibility id.
1. If a view has a node provider, then the latter takes over
   representation of the view tree. Hence, find by accessibility
   id should not return children of a view with a provider.

2. Views can change their importantce for accessibility, so an
   accessibility service may get a node and try to act on it
   but the node became not important in the meantime. Hence,
   find by accessibility id should respect importance.

Change-Id: Ib4d738c00f46c91300605a2928550f40705ea47b
2015-06-03 11:44:47 -07:00
Alan Viverette
4a7bb4624f Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 2015-06-03 18:28:50 +00:00
Jonathan Basseri
f270a8f3d6 Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.

This was tricky to track down because clients get no clear signal that
onBind is returning null.

Bug: 21571360
Change-Id: Id82fce8dfa73a75fae1ce69f73b922addc7daa3e
2015-06-03 11:19:35 -07:00
Jonathan Basseri
13abe77f53 Merge "Fix logic error in CarrierService." into mnc-dev 2015-06-03 18:16:06 +00:00
Adam Powell
a3aa6d8278 Properly restore RTL state in HorizontalScrollView
Fix an incorrect unparceling of the previous saved state in
HorizontalScrollView. Remove an unneeded field in the saved state by
storing scroll offset from start instead of scrollX + isRtl.

Bug 20666194

Change-Id: I1ec45b3e3bd0846b5f659356df7ff94f42e61055
2015-06-03 10:56:45 -07:00
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Abodunrinwa Toki
96e727d1e6 Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 2015-06-03 17:47:47 +00:00
Yoshiki Iguchi
c4c59bc894 am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
* commit '54da4c981b11211f39682511749bcb24f0a397fe':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
2015-06-03 17:46:16 +00:00
Shawn Willden
68f17203b2 am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev
* commit 'b183fdca615e847ed03389905b0a30e30d9d37c5':
  Track changes to the keystore binder API
2015-06-03 17:45:45 +00:00
Filip Gruszczynski
e660d4e96a Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
2015-06-03 10:43:48 -07:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Alan Viverette
6c413ce638 Call dispatchFinishTemporaryDetach before returning a transient view
ListView caches transient state views for reuse during layout, which calls
dispatchStartTemporaryDetach() before caching the view. This should always
be followed by a corresponding dispatchFinishTemporaryDetach() before
removing the view from the cache and returning it for reuse. While this
was the case for other types of cached views, we missed this call for
views placed in one of the two transient view caches.

Bug: 17387206
Change-Id: I360945006558b2783c098183a7cc9bc28d05d9ab
2015-06-03 10:35:44 -07:00
Jonathan Basseri
c0e7a0416d Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.

This was tricky to track down because clients get no clear signal that
onBind is returning null.

Bug: 21571360
Change-Id: If37a52e30d0c7fd0205f23595f39be3d55db69d4
2015-06-03 10:29:39 -07:00
Alex Klyubin
85f4b7b38c Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 17:25:38 +00:00
Alex Klyubin
4699e43dc6 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-03 09:36:51 -07:00
Alex Klyubin
5c56f74527 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 16:35:21 +00:00
Abodunrinwa Toki
6cb5cc19d4 Fix FloatingToolbar positioning for RTL.
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.

-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.

Bug:21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
2015-06-03 16:24:52 +01:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00