67990 Commits

Author SHA1 Message Date
Steve Block
938d2fbc57 Clean up JavaDoc for WebResourceResponse
Clean-up only, no functional change.

Bug: 5461416
Change-Id: Iec37d5f67674b0fb9b5521c179773b7d09a3985c
2012-02-21 10:21:37 +00:00
Steve Block
e5602e057e Merge "Clean up JavaDoc for CookieManager" 2012-02-21 02:18:12 -08:00
Steve Block
77db999077 Clean up JavaDoc for CookieManager
Also fix naming of CookieManager.pendingCookieOperations.

Clean-up only, no functional change.

Bug: 5461416
Change-Id: Ia129c4535b8ef6a5a314e588c34ee6db2fe5b386
2012-02-21 10:15:34 +00:00
Steve Block
28e0390da2 Merge "Make LoadListener.willLoadFromCache() private" 2012-02-21 02:09:34 -08:00
Steve Block
b1affa1747 Make LoadListener.willLoadFromCache() private
This is only called only via JNI. Clean-up only, no functional change.

Change-Id: I8d4ef85ac7634333b3b2283ff12afd7b6a99095f
2012-02-21 10:07:27 +00:00
Mathias Agopian
7c536831d0 Merge "SurfaceFlinger: set wrap mode on screenshot texture" 2012-02-20 22:50:36 -08:00
Mathias Agopian
83c64e6b62 frameworks/base refactoring
create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
2012-02-20 22:38:43 -08:00
Rich Hyndman
0980e41e97 docs: Added Lint into Android Training and removed Layoutopt.
Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
2012-02-20 12:49:10 +01:00
Tsu Chiang Chuang
7b306ae225 am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '90cfe0f2f1e0e54c876157862abc0a588ef84b93':
2012-02-19 07:46:04 -08:00
Todd Poynor
94d0024557 Power HAL PowerManagerService hookup
Use PowerHAL to set system awake/suspend state.

Change-Id: If58a6f548564ea141b68f304455997d9ff04eace
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-02-17 22:19:45 -08:00
Mathias Agopian
4e753e08d1 Merge "frameworks/base refactoring." 2012-02-17 19:26:39 -08:00
Mathias Agopian
b13b9bdad2 frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
2012-02-17 19:01:26 -08:00
Romain Guy
e8585b1721 Correctly offset the dirty bounds by 0.5px in every direction
The existing code was behaving differently for the leaf view and its parents.

Change-Id: I14c1ce5cc149ff840ad957408d6a41bbb4137264
2012-02-17 18:31:31 -08:00
Jason Sams
6db0608dff Merge "Work around VSync signal while screen is off." 2012-02-17 17:20:27 -08:00
Adam Powell
9ffcbcc1f8 Merge "Add transient state tracking to Views" 2012-02-17 17:15:04 -08:00
Jason Sams
f7795e0c2f Work around VSync signal while screen is off.
Change-Id: I0a9637170ee658ff84a363e91c558892dce5cfaf
2012-02-17 17:00:37 -08:00
Jeff Brown
5bf842b22e Fix build break.
Change-Id: I0bc8ac6e76ff28bd4c3585afbd6b3aa1930bf710
2012-02-17 16:56:59 -08:00
Adam Powell
539ee8716b Add transient state tracking to Views
Transient state is temporary bookkeeping that Views need to perform
that the app should not need to be aware of. Examples include text
selection regions and animation state.

Transient state is a problem for AdapterViews like ListView that do
view recycling. Unless the app takes responsibility for tracking and
restoring transient state as if it were a part of the adapter's data
set, it cannot correctly recycle views. Selections disappear when an
EditText is scrolled out of sight and animations seem to play on the
wrong views.

Views can now flag themselves as having transient state. (As the name
implies, this should be a temporary condition.) If a ViewGroup
contains a child with transient state, that ViewGroup also has
transient state.

AbsListView's recycler now tracks views with transient state
separately. Views with transient state will be retained, and until a
data set change occurs the same view will be reused for that position
instead of calling the adapter's getView() method.

The API to set and check transient state is currently hidden.

Change-Id: Idfd8eaac2c548337686d8d9f98fda4c64be5b8a0
2012-02-17 16:40:24 -08:00
The Android Automerger
9c0b825e83 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Alex Sakhartchouk
071e54d7a3 Making sure stranded objects are not left behind.
Change-Id: If678d9dbf818e256862cfc0949015c2a4172bebd
2012-02-17 16:30:36 -08:00
Jeff Brown
4a7571bc0b Merge "frameworks/base refactoring." 2012-02-17 16:28:20 -08:00
Tsu Chiang Chuang
c16d9de729 am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit 'a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
  fix NPE in race condition.
2012-02-17 15:58:12 -08:00
Tsu Chiang Chuang
a626f8d61b am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
2012-02-17 15:55:56 -08:00
Tsu Chiang Chuang
90cfe0f2f1 am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
2012-02-17 15:55:44 -08:00
Tsu Chiang Chuang
2d559b5311 Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Mathias Agopian
b93a03f841 frameworks/base refactoring.
First step. Move libui includes to their new home: androidfw.

Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
2012-02-17 15:36:10 -08:00
Adam Powell
49913d8c60 am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '8035db11ef3da209432b50dc178883ce4683336a':
2012-02-17 15:27:46 -08:00
Adam Powell
c0d0dddc20 am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit 'fef000e3fa968a8dd165753f16c1c4cd38d59f33':
  Bug 6021294 - Contextual action bar animation tweaks
2012-02-17 15:26:56 -08:00
Adam Powell
8035db11ef am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
2012-02-17 15:25:29 -08:00
Adam Powell
fef000e3fa am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
2012-02-17 15:25:18 -08:00
Romain Guy
6917e6550d Merge "Record possible clip rejects when recording display lists" 2012-02-17 15:18:14 -08:00
Adam Powell
482ae5f238 Bug 6021294 - Contextual action bar animation tweaks
Remove the right-to-left cascade effect from action mode menu
items. Animation time is now fixed at 300ms for scaling in menu items.

Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
2012-02-17 15:18:01 -08:00
Siva Velusamy
7d5bb3ddf3 Merge "gltrace: Trace thread time and wall clock time." 2012-02-17 15:05:36 -08:00
Iliyan Malchev
95221b51e4 Merge "libs/utils: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:51:32 -08:00
Mike Lockwood
18ce4566d3 Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place.""" 2012-02-17 14:33:27 -08:00
Iliyan Malchev
d7a3aa452c Merge "bluetooth: replace malloc() + memset() to zero with calloc()" 2012-02-17 14:28:38 -08:00
Iliyan Malchev
7e1d395686 libs/utils: replace malloc() + memset() to zero with calloc()
Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-02-17 14:27:13 -08:00
Iliyan Malchev
8d25cb8a64 bluetooth: replace malloc() + memset() to zero with calloc()
Change-Id: I86b0ee4babc79189184b09c51757ec1162517c7b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-02-17 14:27:13 -08:00
Jean-Baptiste Queru
058bd2ecbc am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails"
* commit '1d4c4d42edb92a3dd82238eafef23a0bfa0267d3':
  Return error code when composing PDU fails
2012-02-17 13:22:56 -08:00
Jean-Baptiste Queru
4b3ec09b81 am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit '99ccf407bf7fc96eab9e1f747e0fa93391330438':
  Add support for bmp and wav content types in MMS
2012-02-17 13:22:54 -08:00
Jean-Baptiste Queru
1d4c4d42ed am 44c1f012: Merge "Return error code when composing PDU fails"
* commit '44c1f012c4ffa75853a068963b212ee1c965b6ea':
  Return error code when composing PDU fails
2012-02-17 13:18:34 -08:00
Jean-Baptiste Queru
99ccf407bf am c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS
2012-02-17 13:18:31 -08:00
Romain Guy
33f6beb10f Record possible clip rejects when recording display lists
This optimization allows us to quickly skip operations that lie
entirely outside of the known bounds of a display list. Because
of ViewGroup.setClipChildren, we must keep the operations recorded
in the display list. setClipChildren(false) is however a very
uncommon operation and we will therefore often benefit from this
new optimization.

Change-Id: I0942c864e55298e6dccd9977d15adefbce3ba3ad
2012-02-17 13:10:00 -08:00
Romain Guy
e97df97b6c Merge "Remove unused private APIs" 2012-02-17 13:09:19 -08:00
Romain Guy
97eda365fc Remove unused private APIs
Change-Id: Ib22005c7ed9923120089a1f1c806bca55bb90967
2012-02-17 13:08:35 -08:00
Eric Fischer
e4895352d3 Merge "Import translations." 2012-02-17 12:18:44 -08:00
Eric Fischer
bd9c5f7687 Import translations.
Change-Id: Ibe6f792ad6e88dfbfd6d523dfe4f24e8e93f4066
2012-02-17 12:15:19 -08:00
Jason Sams
42a23efa85 Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport." 2012-02-17 12:05:13 -08:00
Jason Sams
e158f203d2 Merge "Rename three header files to free namespace for api." 2012-02-17 12:04:20 -08:00
Jean-Baptiste Queru
44c1f012c4 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00