Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,295 Commits 3 Branches 0 Tags
3cd93a7055ca30d811d981cef84110ef02ea7257
Commit Graph

48919 Commits

Author SHA1 Message Date
Clara Bayarri
3cd93a7055 am 3341fa53: am 79c389de: am eb665337: Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 
* commit '3341fa534985b55086099931ab079404fc0c12dd':
  Fix Floating tool bar covers text during long press + drag
 2015-06-03 23:11:50 +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
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
f9ccf37ec1 am a28b6021: am a80a8025: am 95753e2f: Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 
* commit 'a28b60217affc8e0cef6e06e3901347c9011692b':
  Ensure to reset state of selecting by word/char for new selections
 2015-06-03 22:26:50 +00:00
James Cook
d6a9223aa3 am 72921131: am 9a0f4bd4: am 8fd48ca3: Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 
* commit '72921131d967b560158c2891a8bf570bff106f33':
  Fix TabHost stealing focus on hardware keyboard keypress
 2015-06-03 22:26:16 +00:00
Adam Powell
18033be14b am 93925483: am cb3b67f4: am c52e0d90: Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev 
* commit '93925483f38e19d9e5b4e3fb95ec4d103b975cfc':
  Properly restore RTL state in HorizontalScrollView
 2015-06-03 22:24:52 +00:00
Dmitriy Ivanov
0f9c945c4e am ba429fc6: am d04af00b: am 77f55c5c: Merge "Fix build" into mnc-dev 
* commit 'ba429fc6e9c161464d9301a405b93b7c0559bc68':
  Fix build
 2015-06-03 22:24:23 +00:00
Svetoslav
eb3b1c9b20 am c61aa888: am 68631f0a: am afa9e99c: Merge "Fix finding views by accessibility id." into mnc-dev 
* commit 'c61aa888b96dc604a072b20863067d80aafb981d':
  Fix finding views by accessibility id.
 2015-06-03 22:24:03 +00:00
Alan Viverette
b79ac367ad am 88bba269: am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev 
* commit '88bba269c64b1bfc2ea2ce38bf6cdd9fcd4deccb':
  Call dispatchFinishTemporaryDetach before returning a transient view
 2015-06-03 22:23:58 +00:00
Jonathan Basseri
6a65b2101d am 5257e92f: am f28ab7a7: am f270a8f3: Fix logic error in CarrierService. 
* commit '5257e92f2631f7fb3650a4c4e05dfa2ab773bcd9':
  Fix logic error in CarrierService.
 2015-06-03 22:23:52 +00:00
Jonathan Basseri
fe92dd2179 am 4b97a3fe: am cc00587c: am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev 
* commit '4b97a3fe01d8718c1e7833a3a4d26f7b11bfeb6a':
  Fix logic error in CarrierService.
 2015-06-03 22:23:47 +00:00
Filip Gruszczynski
e31aba5ec4 am 3dc18c57: am da992dee: am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 
* commit '3dc18c57882af97689248450500c30b969ca81cc':
  Fix NPE when requesting outsets for detached view.
 2015-06-03 22:22:43 +00:00
Yohei Yukawa
3adf706c2c am fd417eb4: am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 
* commit 'fd417eb40557be9e780e4739d35fb5b2ec62a705':
  Convert subtypes whose locale is "tl" to "fil".
 2015-06-03 22:22:31 +00:00
Alex Klyubin
2c892a6541 am 38012dba: am 0623bc8a: am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 
* commit '38012dba5c2f417e25b8d6aa23e64dd5bf987bea':
  Fix block mode numbering (CTR got added as 4 rather than 3)
 2015-06-03 22:22:26 +00:00
Alex Klyubin
7ff6121b87 am b4f06ff3: am 0643449d: am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 
* commit 'b4f06ff3353b931a33cac5fef499c15f08151520':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
 2015-06-03 22:21:31 +00: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
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
Yoshiki Iguchi
bce3ea3617 am c4c59bc8: am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 
* commit 'c4c59bc894f1f1b268072c8387e1faa71b3ff1b1':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
 2015-06-03 19:23:00 +00:00
Shawn Willden
0002c54595 am 68f17203: am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev 
* commit '68f17203b20a29858b3f7dcefbdf89b8a3b2010f':
  Track changes to the keystore binder API
 2015-06-03 19:22:48 +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
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
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
Seigo Nonaka
0e96884382 am 12eaf366: am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev 
* commit '12eaf366f963f883d89d0713b458c698c514ab96':
  Use final in favor of initialization safety.
 2015-06-03 17:36:30 +00:00
Casper Bonde
919331dfcc am 8b8af64d: am 80233cda: am 2328423d: Add support for MITM for BluetoothSockets (1/4) 
* commit '8b8af64d84f7ac88ad68f367babdffc664d48cb4':
  Add support for MITM for BluetoothSockets (1/4)
 2015-06-03 17:36:17 +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