Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,669 Commits 3 Branches 0 Tags
12e08ca9873050e20b1fdbdb59f8b0ffdbc37719
Commit Graph

28471 Commits

Author SHA1 Message Date
Victoria Lease
807c5e2adf am 956e0df9: am 913f3c8f: am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '956e0df9222296f7dd5f5a997462168ead03a30a':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 23:58:26 +00:00
Victoria Lease
54afd76fc0 am ac112cac: am b2f91e7b: am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit 'ac112cace6ded8b143179f0a6b03355b24e025bb':
  Audio continue to played even if paused manually
 2013-03-05 23:58:23 +00:00
Victoria Lease
913f3c8f17 am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '263554ae5f51fe1181c0c80123ec7f489e124f1a':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 23:53:48 +00:00
Victoria Lease
b2f91e7b23 am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit '8ef243cf861044eec35ee3d8207561251e34c77c':
  Audio continue to played even if paused manually
 2013-03-05 23:53:46 +00:00
Victoria Lease
263554ae5f am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 15:51:19 -08:00
Victoria Lease
8ef243cf86 am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit 'f45efd276c9b09adcb97ea43afc806731583aac7':
  Audio continue to played even if paused manually
 2013-03-05 15:51:16 -08:00
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Fabrice Di Meglio
844efa911f am 80273c6b: am 5f51fd69: Merge "Make Spinner widget RTL-aware (part 2)" into jb-mr2-dev 
* commit '80273c6b5973d7d4d100a35f6646af45a3179740':
  Make Spinner widget RTL-aware (part 2)
 2013-03-05 22:29:22 +00:00
Fabrice Di Meglio
b0359666b4 am cc2e3c05: am 8e440a6c: Merge "Improve RTL code for RelativeLayout" into jb-mr2-dev 
* commit 'cc2e3c05d2a0f58e67ed00e1ee1f08150d78ffcf':
  Improve RTL code for RelativeLayout
 2013-03-05 22:29:19 +00:00
Fabrice Di Meglio
5f51fd6970 Merge "Make Spinner widget RTL-aware (part 2)" into jb-mr2-dev 2013-03-05 22:23:33 +00:00
Fabrice Di Meglio
8e440a6c1a Merge "Improve RTL code for RelativeLayout" into jb-mr2-dev 2013-03-05 22:20:30 +00:00
Scott Main
ae634d2a61 am 3c760619: am 892b9794: am 47c59b48: am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '3c76061952ab5a120b7a4beba08b0f8fbc4d3b38':
  docs: clarify startActivity
 2013-03-05 21:25:24 +00:00
Scott Main
892b979478 am 47c59b48: am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '47c59b48357d875a6a0278e945e4c08700886b37':
  docs: clarify startActivity
 2013-03-05 21:16:45 +00:00
Scott Main
47c59b4835 am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '01798b0553ffd504b0012a8f3ffb7a8d3c1be641':
  docs: clarify startActivity
 2013-03-05 13:13:48 -08:00
Fabrice Di Meglio
f80ceed450 Make Spinner widget RTL-aware (part 2) 
See bug #8159072 Spinner widget should be RTL'ized

Change-Id: I3f9368f242a027852bf13a7ce4b760de1e1c2fb2
 2013-03-05 13:12:13 -08:00
Scott Main
01798b0553 am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '76d857639efa3e5fd01553a26b6742a6895d189f':
  docs: clarify startActivity
 2013-03-05 13:09:44 -08:00
Dianne Hackborn
ee61a7fb95 am 530b2b1c: am a5513616: Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev 
* commit '530b2b1c98e3a3d86fd90cd91a08005370b8aa49':
  Add new WindowId for cross-process monitoring of focus.
 2013-03-05 21:08:13 +00:00
Fabrice Di Meglio
d5ffc79fc8 Improve RTL code for RelativeLayout 
- instead of passing the screen size as a constant for computing the
layout size in RTL mode, we just use a real constant. Any value would
work actually, as soon as the value would not be null.

Change-Id: If9f5b38afa88938db36a795bfc8a403ad660726b
 2013-03-05 13:07:08 -08:00
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
 2013-03-05 13:03:25 -08:00
Philip Milne
a235362152 GridLayout diagnostics. 
Add null check for:

https://googleplex-android-review.git.corp.google.com/#/c/183792/

Change-Id: Ic8ef7b6749b6d2568ed4e4b3b1fa4ad6659c70eb
 2013-03-05 12:21:43 -08:00
Dianne Hackborn
07a55b376c Merge "Welcome, Key Lime Pie." 2013-03-05 19:50:54 +00:00
Philip Milne
0e051852e5 Merge "Provide (general) mecahnism for users of GridLayout to either suppress or react to diagnostics." 2013-03-05 19:48:23 +00:00
Dianne Hackborn
5d2bfa1604 Welcome, Key Lime Pie. 
Change-Id: I00ebaffda975b368aa5f727963899e80a233c744
 2013-03-05 10:28:34 -08:00
Dianne Hackborn
a55136169e Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev 2013-03-05 17:37:43 +00:00
Dianne Hackborn
e3f23a36d8 Add new WindowId for cross-process monitoring of focus. 
This is a class representing a window and providing limited
interaction with it, which can be handed across processes.

Change-Id: I22885f2064a9cc8c68d690a5858c2e28bbb6a0f3
 2013-03-05 09:33:48 -08:00
Chet Haase
573596de3b Merge "ListView transient state fix" 2013-03-05 14:26:35 +00:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually 
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-03-05 13:05:34 +00:00
Romain Guy
4001b31cba am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 
* commit '370929f4bf6b9d7a196eae531f38cdec19140dfd':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
 2013-03-05 03:15:37 +00:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas 
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
 2013-03-04 19:08:02 -08:00
Mathias Agopian
c18fb64084 am e94fcd6c: am 188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 
* commit 'e94fcd6c494931afc1d7f70138db01de37cdb9fc':
  screenshots can now go into a Surface from java
 2013-03-05 02:37:43 +00:00
Mathias Agopian
188f8c5e4b Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 2013-03-05 02:31:15 +00:00
Mathias Agopian
0449a40586 screenshots can now go into a Surface from java 
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
 2013-03-04 17:45:26 -08:00
Brian Carlstrom
8df79da5d1 am 31167ffb: am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '31167ffb2def7461edbac9b8c35366bb6a0e5881':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 01:02:41 +00:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 00:56:05 +00:00
Philip Milne
211d03322c Provide (general) mecahnism for users of GridLayout to either suppress or react to diagnostics. 
GridLayout uses a constraint solver to perform its layout operation. Some layout problems
result in systems of constraints that are inconsistent and so cannot be solved. GridLayout
detects this condition and makes corrections so as to always guarantee that the layout
operation will complete. In those cases where corrections are made, GridLayout issues a
warning to the Log. This CL allows (internal) clients of GridLayout to both swtich off
the logging and/or detect when this condition is encountered.

Change-Id: I5b871003381f81cf0a76ad3de767e7f8b8349923
 2013-03-04 16:40:30 -08:00
Philip Milne
c2a6e194a6 Merge "Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value." 2013-03-05 00:00:12 +00:00
Philip Milne
f091b66246 Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value. 
This is an addendum to:

https://googleplex-android-review.googlesource.com/#/c/246507

Change-Id: Ia9d6fdfe7fdb76c1152466315ff3b1c42c077ee2
 2013-03-04 15:46:22 -08:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached 
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
 2013-03-04 14:02:29 -08:00
Christopher Tate
e9accff210 Don't crash when we get a drag-ended after being detached 
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

Bug 8298439

Change-Id: I665ba1d139e8aaa820f5f515186bc4ce8bcdb1ea
 2013-03-04 13:19:39 -08:00
Chet Haase
9e7c7d7b85 ListView transient state fix 
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.

A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.

Issue #8254775 View.setHasTransient state has side-effects when deleting content in ListView

Change-Id: Ic3b1669ed79dd6cf9e4c1c6c26f9d75ccf074b3e
 2013-03-04 12:51:21 -08:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-04 10:52:49 -08:00
Jeff Sharkey
4e6d19656e am 2e0da1ea: Merge "Improve performance of storage measurement." into jb-mr2-dev 
* commit '2e0da1ea5f2493d968b4b83d4a0dd54e2cc63849':
  Improve performance of storage measurement.
 2013-03-02 06:20:17 +00:00
Jeff Sharkey
2e0da1ea5f Merge "Improve performance of storage measurement." into jb-mr2-dev 2013-03-02 06:14:51 +00:00
Jeff Sharkey
237940a092 am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
  Tighten enforcement of file modes.
 2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
 2013-03-01 17:30:45 -08:00
Jeff Sharkey
1e5e3748d4 am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
 2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
 2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes. 
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
 2013-03-01 17:20:51 -08:00