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

5155 Commits

Author SHA1 Message Date
Chet Haase
4f0c4672ac Fix CrossFade transition 
Small fixes in CrossFade to handle more general situations.
Also, added API to CrossFade to enable different behaviors during
the transition.

Change-Id: I12d17ab8f8f96be370c070373112ad8a62df9115
 2013-06-06 07:37:32 -07:00
John Spurlock
894e1d9914 Merge "Unhide MotionEvent#actionToString." 2013-06-05 19:50:48 +00:00
John Spurlock
4dad6cab64 Unhide MotionEvent#actionToString. 
Also clarify the input as unmasked, and fix a few other found doc
issues in related methods.

Change-Id: I1338a17dea0282b99229925dea8e48693e177eaa
 2013-06-05 13:25:28 -04:00
Przemyslaw Szczepaniak
653278341d Allow TTS service to identify caller. 
Added new field (+setter and getter) to SynthesisRequest with
Uid of a calling process. TTS service will be able to discover
packages names associated with caller using
PackageManager.getPackagesForUid.

This will allow to block buggy or poorly designed programs from
an unintentional DDoS attacks against TTS service.

Bug: 8625440
Change-Id: I5ac0ea191f952495c00301f17efdf28205353ae4
 2013-06-05 14:44:52 +00:00
Chet Haase
08735185f8 Use ArrayMap instead of HashMap in transitions 
The new ArrayMap class is more efficient for small collections.
Transitions use maps all over the place to collect/use property
values in setting up the transition animations. Changing to ArrayMap
should be more efficient, especially in terms of memory allocations
and GCs.

Issue #9276256 Transitions: Reduce memory allocations

Change-Id: I07b7d4ba68d5a207808eca11943aa3578fa90e3e
 2013-06-04 10:44:40 -07:00
Adam Powell
3f7a6935d3 Merge "Fix a bug resolving the correct icon/logo in action bars" 2013-06-01 00:07:05 +00:00
Adam Powell
04fe6ebb9f Fix a bug resolving the correct icon/logo in action bars 
Remove some abstraction-breaking magic in ActionBarView and replace it
with proper resolution of the icon/logo when creating a window. The
old implementation relied on the ActionBarView's context being an
Activity.

Bug 9171554

Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
 2013-05-31 15:00:24 -07:00
Jeff Brown
718aefb6ff am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '6474d8407cb1551608fc403861e11cf514f8558e':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:02:31 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Daniel Sandler
2c52b08c33 am 491c6075: am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '491c607582248590702ce07c0493ff0c39224689':
  Unhide action to launch Daydream settings.
 2013-05-30 15:16:14 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Daniel Sandler
491c607582 am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.
 2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
Daniel Sandler
f3c1c7ea0a Unhide action to launch Daydream settings. 
Bug: 9088316
Change-Id: I70b87e1f320cef4f53b2610a94be8e552dd3a757
 2013-05-29 22:28:22 -04:00
Lajos Molnar
ddcbb64a2a am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit 'fabd32c1fb353c4e1437f1472de5ec2810bda329':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:25:35 -07:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Lajos Molnar
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Matthew Xie
16a90db8d7 am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:30:10 -07:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Chris Craik
9f58361e98 Support larger bitmaps in BitmapFactory.Options.inBitmap 
bug:8121994

Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.

BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.

Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
 2013-05-28 13:50:33 -07:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
Matthew Xie
8310e6196f Change GATT_FAILURE from 0 to 0x101 
GATT_FAILURE 0 clashes with GATT_SUCCESS. For now, they represent different
kind of faiure. One for Gatt operation, one for Gatt registration. But we
should separate them as good practice.
bug 9109238

Change-Id: I686bb6004bc8831aa3e3bbffe2f7c8e24412e3c3
 2013-05-23 17:39:35 -07:00
Anwar Ghuloum
3c61506b71 Add more memory usage stats 
Added support for teasing apart different parts of the dalvik heap.

Note this adds more public api and we should talk to hackbod before going into master with this.

(cherry picked from commit 73407daf3f6110e933d8614605b21586c4c5fde2)

Change-Id: If4431f50e67e18bcc42e00694c97805477bd6815
 2013-05-23 12:30:42 -07:00
Anwar Ghuloum
3a8ce1bec8 More stats for meminfo 
Added shared clean tracking (for pageable stuff).  Renamed .oat and .art mmap.

(cherry picked from commit 967d53b17b6010c3a675ca9c3bbd0e9dd2f2f092)

Change-Id: I741e0dbe0d3f9aee6975c6fad8af9905942962d4
 2013-05-23 12:29:59 -07:00
Craig Mautner
6d90fed076 Add stackId to RecentTaskInfo 
Necessary for multi-stack activity overview.

Fixes bug 9092356.

Change-Id: I3d51a7b5cbca6166017759401bb5d31b4ae96f07
 2013-05-22 17:23:25 -07:00
Jeff Brown
2feefe01e9 am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit 'b7871af2fbde70c7cf4812d5710b2729588bac54':
  Add route description API.
 2013-05-17 12:46:08 -07:00
Jeff Brown
b7871af2fb am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.
 2013-05-17 12:44:37 -07:00
Jeff Brown
56d4b744b3 Add route description API. 
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
 2013-05-16 14:41:30 -07:00
Dianne Hackborn
c87c92e079 Add API to retrieve cursor notification URI. 
Change-Id: I89f6c4d6ee6ef3675eff62ff6bca691b54c69f75
 2013-05-15 15:39:47 -07:00
Kenny Root
92d96fe94f am f35b35df: am cdc457bb: Merge "Tracking change to add AEAD functionality" 
* commit 'f35b35df6e5690577a9fbdb8a94903ad65a14a29':
  Tracking change to add AEAD functionality
 2013-05-14 18:34:08 -07:00
Kenny Root
f35b35df6e am cdc457bb: Merge "Tracking change to add AEAD functionality" 
* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
  Tracking change to add AEAD functionality
 2013-05-14 18:29:22 -07:00
Kenny Root
e60bcc63e5 Tracking change to add AEAD functionality 
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9

Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
 2013-05-14 17:54:07 -07:00
Elliott Hughes
112a2b6ca7 am 4d86196f: am b37652a2: Merge "Track libcore API changes." 
* commit '4d86196ff289084ff062073832fa3ab737ec0061':
  Track libcore API changes.
 2013-05-14 11:48:23 -07:00
Elliott Hughes
4d86196ff2 am b37652a2: Merge "Track libcore API changes." 
* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
  Track libcore API changes.
 2013-05-14 11:45:38 -07:00
Elliott Hughes
a377b42109 Track libcore API changes. 
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
 2013-05-14 10:55:52 -07:00
Conley Owens
7651c69e38 am e5cf479d: am d40c41df: Merge "Track libcore changes." 
* commit 'e5cf479deb47ef523c521c23f1fbbaa2171ff370':
  Track libcore changes.
 2013-05-13 15:06:22 -07:00
Conley Owens
e5cf479deb am d40c41df: Merge "Track libcore changes." 
* commit 'd40c41df0044a155b68f3c6b21ec08bc64f5b6c7':
  Track libcore changes.
 2013-05-13 14:59:11 -07:00
Elliott Hughes
0d5dee2bc3 Track libcore changes. 
Bug: 3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
 2013-05-13 14:15:39 -07:00
Elliott Hughes
ea47c0bd94 am c56944ed: am ebda92b8: Merge "Track libcore cleanup." 
* commit 'c56944ed951771670e0420a1a2b94d01b701f1b3':
  Track libcore cleanup.
 2013-05-11 00:10:43 -07:00
Elliott Hughes
c56944ed95 am ebda92b8: Merge "Track libcore cleanup." 
* commit 'ebda92b84aeac7a5c5a431d6d9cecea2c3c44a97':
  Track libcore cleanup.
 2013-05-11 00:08:30 -07:00
Elliott Hughes
4dbfe64675 Track libcore cleanup. 
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
 2013-05-10 23:47:08 -07:00
Elliott Hughes
6a93e8b67a am 9a763630: am 37dbac9c: Merge "Expose @SafeVarargs." 
* commit '9a76363016b87a4c2ab02d02ea0aafcc39a6eece':
  Expose @SafeVarargs.
 2013-05-10 23:05:50 -07:00
Elliott Hughes
9a76363016 am 37dbac9c: Merge "Expose @SafeVarargs." 
* commit '37dbac9c40d0d7163028461697f2adef1ffe6c47':
  Expose @SafeVarargs.
 2013-05-10 23:04:41 -07:00