Commit Graph

52563 Commits

Author SHA1 Message Date
Clara Bayarri
a0352486f5 am eb665337: Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev
* commit 'eb665337162416c4754a9f11005004a8d936775e':
  Fix Floating tool bar covers text during long press + drag
2015-06-03 22:45:49 +00: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
Mady Mellor
8ff1c4e82e am 95753e2f: Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev
* commit '95753e2f4b423bd914d6087c1847fc851080cae9':
  Ensure to reset state of selecting by word/char for new selections
2015-06-03 21:27:37 +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
James Cook
d43b6c62f1 am 8fd48ca3: Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev
* commit '8fd48ca377956e434819ade33a9970cd66a2fda7':
  Fix TabHost stealing focus on hardware keyboard keypress
2015-06-03 21:07:41 +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
Adam Powell
a83107392a am c52e0d90: Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev
* commit 'c52e0d900cc6f7ca60c7079ab50297b4a4b0c426':
  Properly restore RTL state in HorizontalScrollView
2015-06-03 19:57:08 +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
5eb764ca1e am 77f55c5c: Merge "Fix build" into mnc-dev
* commit '77f55c5c60fd5cbcc4383142fd285fad3dd051ea':
  Fix build
2015-06-03 19:30:58 +00:00
Dmitriy Ivanov
bac9576928 Fix build
Bug: 21602590
Change-Id: Iffb9a7b74dc97bf30aea2014b0e3d2a96097291b
2015-06-03 19:18:59 +00:00
Svetoslav
0e89264386 am afa9e99c: Merge "Fix finding views by accessibility id." into mnc-dev
* commit 'afa9e99c8849ede4a71610b0d2bcb86cb7cb6d66':
  Fix finding views by accessibility id.
2015-06-03 18:57:28 +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
07ae5b008b am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
* commit '4a7bb4624f3b8a0633461e2f5d662fd80d816bbf':
  Call dispatchFinishTemporaryDetach before returning a transient view
2015-06-03 18:39:17 +00: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
443ba65faa am f270a8f3: Fix logic error in CarrierService.
* commit 'f270a8f3d653be4a6b8f665e8211db4f39507bb3':
  Fix logic error in CarrierService.
2015-06-03 18:27:52 +00:00
Jonathan Basseri
a24708dbc3 am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev
* commit '13abe77f53ed2691a4cf926e8e3c0faa43a08f32':
  Fix logic error in CarrierService.
2015-06-03 18:27:47 +00:00
Filip Gruszczynski
c54979a970 am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
* commit '844fbff80c72771d21ddabf13de8fe91312c3cd6':
  Fix NPE when requesting outsets for detached view.
2015-06-03 18:27:14 +00:00
Abodunrinwa Toki
53c3afafb6 am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev
* commit '96e727d1e63a918039ca1b1b1c98ec23ba108247':
  Fix FloatingToolbar positioning for RTL.
2015-06-03 18:26:52 +00:00
Yohei Yukawa
3145d0f8ce am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
* commit '168d38aa3c200ea8a823e3faa64345e776e0da31':
  Convert subtypes whose locale is "tl" to "fil".
2015-06-03 18:26:46 +00:00
Alex Klyubin
68ca9a5e6c am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit '85f4b7b38cedddfb0ed9f57555fb81aceca786ac':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-03 18:26:36 +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
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
74a525a014 am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit '5c56f74527d4d5c8c92c95e7e47319d2324bdb4d':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-03 16:47:03 +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
25b29c064c am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
* commit '0d8513adcacbbbc88b5228ad6fca12a38c721fce':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
2015-06-03 06:16:46 +00: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
781a8c210e am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev
* commit '56396c7f5b54d165b46969ea3152abbb23cf792f':
  Track changes to the keystore binder API
2015-06-03 05:34:54 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Seigo Nonaka
16d0f5fc54 am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev
* commit '2752a14939d113e3f2696458b0b969bc023dadfa':
  Use final in favor of initialization safety.
2015-06-03 05:09:28 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
2015-06-03 04:53:44 +00:00
Casper Bonde
3b02fb6e43 am 2328423d: Add support for MITM for BluetoothSockets (1/4)
* commit '2328423d19416da0c1068883c33e612d5729fc47':
  Add support for MITM for BluetoothSockets (1/4)
2015-06-03 03:56:36 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:40 +00:00
Erik Kline
5f69ef9e33 am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
* commit 'b12c97040bff6b42a513b50cdf75a98d41cdb249':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:07:43 +00:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Svetoslav
8d8caf3091 am f559546d: Merge "Add annotations to a new API" into mnc-dev
* commit 'f559546d8c47988f5c4278bde27eb26da1c256cc':
  Add annotations to a new API
2015-06-03 01:06:07 +00:00
Andres Morales
a6862f4398 am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev
* commit '8f589d01d15efe88f3678b22db97223c01a54225':
  [LockSettings] migrate patterns to be indexed at '1'
2015-06-03 01:05:58 +00:00