drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,611 Commits 1 Branch 0 Tags
Commit Graph

38815 Commits

Author SHA1 Message Date
Yohei Yukawa
c941fedf50 Use java.util.Objects 
This is a follow up CL for I451544fba746a76618.

This CL replaces libcore.util.Objects with java.util.Objects as
java.util.Objects is getting more and more widely used in
Android. There should be no behavioural change anyway.

Change-Id: Id9568ee98aa3845588017c3711e7d03a3481beea
 2014-05-14 19:38:07 +09:00
Yohei Yukawa
d6f4e37554 Merge "Support IMM#updateCursorAnchorInfo in Editor" 2014-05-14 08:02:31 +00:00
Yohei Yukawa
83b68ba4ad Support IMM#updateCursorAnchorInfo in Editor 
With this CL, Editor starts calling IMM#updateCursorAnchorInfo
iff IMM#isWatchingCursor(View) returns true. The performance
regression should be negligible when IMM#isWatchingCursor(View)
returns false.

BUG: 14579622
Change-Id: Ib35a6f4201b26d837a6aa07d1204c9eb75404da1
 2014-05-14 16:22:53 +09:00
Robert Greenwalt
2491c3a0e8 Merge "Add Network-specific host name resolution API." 2014-05-14 05:39:10 +00:00
Chulwoo Lee
c3e00c3ffc Fix NPE while dispatching input event. 
- occasionally, TvView can be detached while
  the input event is being processed.

BUG: 14791903
Change-Id: Id1def32ace1bf9765ae30a00ea4579670d1d40aa
 2014-05-14 14:35:00 +09:00
Robert Greenwalt
e049c23980 Add NetworkFactory support. 
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
 2014-05-13 21:21:49 -07:00
Adam Powell
3288dbafe9 Merge "Tweak EdgeEffect" 2014-05-14 02:38:20 +00:00
Adam Powell
2897a6fded Tweak EdgeEffect 
Make the effect less prominent/bulbous and not hit limits quite so
easily.

Change-Id: Ib8fdc29867276e6d0db447b60db0d7be3503d4d8
 2014-05-13 19:05:53 -07:00
Craig Mautner
7fd239cf0a Merge "Pass ActivityOptions back from finishing activity." 2014-05-14 00:54:41 +00:00
Youngsang Cho
a6a97905dc Merge "Fix NPE in TvInputService and TvView" 2014-05-14 00:39:28 +00:00
Igor Murashkin
fab0eadef2 Merge "camera2: Update native<->managed camera metadata marshalers" 2014-05-14 00:03:38 +00:00
Justin Koh
fc986d71ca resolved conflicts for merge of 32c5f299 to master 
Change-Id: I72656792e109fea82c63a3a42151c024630f5997
 2014-05-13 16:52:17 -07:00
George Mount
11d0415481 Merge "Check for null Drawable in MoveImage" 2014-05-13 23:31:09 +00:00
Justin Koh
32c5f2998f am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes. 
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
  Set KITKAT_WATCH to be level 20, document API specific changes.
 2014-05-13 23:24:33 +00:00
Paul Jensen
3e32a4b667 Add Network-specific host name resolution API. 
Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
 2014-05-13 19:05:13 -04:00
Justin Koh
78b94de4b5 Set KITKAT_WATCH to be level 20, document API specific changes. 
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
 2014-05-13 16:03:18 -07:00
Justin Koh
72a4c15c49 am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 
* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
  Hide new methods in notificationlistenerservice DO NOT MERGE
 2014-05-13 22:45:50 +00:00
Igor Murashkin
3c40a046cf camera2: Update native<->managed camera metadata marshalers 
* Improve existing marshalers:
 - each managed/native type combination can be queried marshal support
 - marshalers can recursively call other marshalers for nested types
 - support marshaling/unmarshaling generic classes by using super type tokens

* Add new marshalers for:
 - ColorSpaceTransform
 - MeteringRectangle
 - Parcelable
 - Range<T>
 - ReprocessFormatsMap
 - RggbChannelVector
 - SizeF
 - StreamConfiguration
 - StreamConfigurationDuration

Batteries included; so are unit tests.

Bug: 14628001
Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
 2014-05-13 15:28:24 -07:00
Justin Koh
e98122ed5d Hide new methods in notificationlistenerservice DO NOT MERGE 
Hide new methods in notificationlistenerservice for now.
Bug: 14116162

Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
 2014-05-13 15:10:16 -07:00
John Reck
191437447a Merge "Wire up texture atlas" 2014-05-13 21:59:31 +00:00
John Reck
66f0be65a1 Wire up texture atlas 
Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
 2014-05-13 14:54:42 -07:00
Aaron Whyte
8f8c7f413f am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:41:38 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:36:31 +00:00
George Mount
d8d99984c5 Merge "Add view name to Transition matching." 2014-05-13 20:08:20 +00:00
George Mount
30da61d477 Add view name to Transition matching. 
Bug 14625214

Change-Id: Ia1b21e6bd0ea4892b504746e582aeb175e0f0506
 2014-05-13 13:07:06 -07:00
George Mount
e8f5a255e0 Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS" 2014-05-13 19:14:16 +00:00
George Mount
0ab4c72914 Merge "Change sharedElementName to viewName." 2014-05-13 19:13:28 +00:00
Nicolas Prevot
2022597859 Merge "Resolving resources across users." 2014-05-13 17:17:18 +00:00
Craig Mautner
233ceeebab Pass ActivityOptions back from finishing activity. 
Adding an ActivityOptions parameter to convertToTranslucent provides
a mechanism for delivering these options to the activity that
launched the one that is returning.

Fixes bug 13032208.
Fixes bug 14469460.
Fixes bug 14597427.

Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
 2014-05-13 09:51:50 -07:00
George Mount
d8cdb8cc2c Check for null Drawable in MoveImage 
Bug 14676155

Change-Id: Ic8d2c3fc471a876f5369e743e60ffb0f238f3eed
 2014-05-13 09:33:54 -07:00
George Mount
5d1be53644 Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS 
Bug 14655908

Change-Id: I60c38aca4a00410b792e2f7ce617ea78c162db55
 2014-05-13 09:25:31 -07:00
John Reck
515396a6b5 Merge "More native interpolators" 2014-05-13 16:17:03 +00:00
Jason Monk
b01c6855c0 Merge "Switch PacUrl storage from String to Uri" 2014-05-13 15:14:50 +00:00
Yohei Yukawa
36b3424820 Merge "Do not send duplicate CursorAnchorInfo to IME" 2014-05-13 14:06:51 +00:00
Nicolas Prevot
d85fc72fb8 Resolving resources across users. 
When an intent is sent to another profile:
For content uris contained in this intent:
The userId of the source user is added to the userInfo part.
The ActivityManagerService has been modified to resolve resources in the user specified by the uri.
The user id to which the uri belongs to is stored in the UriPermission.

Change-Id: I43dc76895aba692bf148d276253aeaf9c75fce34
 2014-05-13 14:59:52 +01:00
Youngsang Cho
c31c450f5d Fix NPE in TvInputService and TvView 
Bug: 14781233, Bug: 14629185
Change-Id: I8511674f4f3864b3deaa58f4c95b9c91e68f49f4
 2014-05-13 21:28:55 +09:00
Sander Alewijnse
57dacb7eb0 Merge "Group account management methods and add some comments." 2014-05-13 10:30:01 +00:00
Yohei Yukawa
056ffe6d06 Do not send duplicate CursorAnchorInfo to IME 
This CL adds an optimization which checks if the same
CursorAnchorInfo is sent to the input method to
prevent these duplicate messages from being sent
unnecessarily.

BUG: 14579622
Change-Id: I451544fba746a766186123b9ac276221e968c8c3
 2014-05-13 19:28:59 +09:00
Przemyslaw Szczepaniak
92c6d71dc9 Merge "Add (hidden) TTSEngines#isLocaleSetToDefaultForEngine method." 2014-05-13 09:39:29 +00:00
Sungsoo Lim
2b35a72a69 Handle the crash of TIS. 
- Implement DeathRecipient for SessionState.
- Implement onServiceDisconnected.
- Add callback methods for notifying the death of Session.

Bug: 14073482
Change-Id: Ifdc54266a878224844a221f0b52415d0bc378e39
 2014-05-13 14:27:09 +09:00
Sungsoo Lim
51391666ee Merge "Replace ComponentName to InputId." 2014-05-13 05:24:37 +00:00
Aaron Whyte
1fb617fecd Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. 
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
 2014-05-12 22:08:53 -07:00
Youngsang Cho
468971085b Merge "Use copied input events in TvView" 2014-05-13 04:20:48 +00:00
Aaron Whyte
51f110f9d7 am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev 
* commit 'd67fd6428a2bcaedca79fb96f971dd021e08a651':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
 2014-05-13 02:31:48 +00:00
Aaron Whyte
d67fd6428a am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev 
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
 2014-05-13 02:27:00 +00:00
Aaron Whyte
6af2ef8e25 Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev 2014-05-13 02:24:13 +00:00
Aaron Whyte
d5f010e4e7 Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" 
This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.

Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
 2014-05-13 02:19:10 +00:00
Aaron Whyte
71dfd44c9b am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 01:55:26 +00:00
Aaron Whyte
064789efc1 am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 01:49:16 +00:00
Aaron Whyte
24f3d0915e Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 01:44:18 +00:00