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

32591 Commits

Author SHA1 Message Date
Chet Haase
90b8994470 Merge "Various fixes/cleanup in Scenes and Transitions" 2013-06-03 23:41:08 +00:00
Chet Haase
867a86613d Various fixes/cleanup in Scenes and Transitions 
setDuration() wasn't handled correctly for TransitionGroup; it should
propagate the value to its children.

Also, videos with no ids were not being handled correctly. The transition code was
using the default id on those views (-1) to store start/end data about the view,
causing multiple non-id views to clobber values in the hashmaps. The correct approach
should be to ignore default id values - only store information about the view
instances, not about the unset ids.

Also, added a new test InterruptTest to be used to fix the current behavior of
not handling situations where new transitions start while old ones are still taking place.

Change-Id: I4e880bdbb33cc26d487bceb0d56e463e72f7621f
 2013-06-03 16:37:05 -07:00
Romain Guy
a4b7965cc2 Merge "Replace HashMap with ArrayMap to remove unnecessary allocations" 2013-06-03 22:52:20 +00:00
Romain Guy
6876b4fb90 Replace HashMap with ArrayMap to remove unnecessary allocations 
This change also fixes a race condition. If multiple UI threads are used
in a single process, RelativeLayouts could end up using the same nodes
in different windows, causing mayhem and headaches.

Change-Id: I9ba4a0bf05d44e1a1e7a82443d40c500c657cd7a
 2013-06-03 15:40:52 -07:00
Romain Guy
36e337f971 Merge "Remove unnecessary lock to save 1 allocation per TextView" 2013-06-03 22:38:07 +00:00
Joe Malin
64f2227bbc am 8811154e: am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '8811154e9369ff936c35f355034ec1f6aafa984e':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:34:00 -07:00
Joe Malin
8811154e93 am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '423f8a8c21ec4e702e72ffce27bb3b5481170bae':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:31:21 -07:00
Joe Malin
423f8a8c21 am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '2618ac55a94a97e29abd9defa93dea30e067b4e4':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:27:50 -07:00
Joe Malin
2618ac55a9 am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'a37bda7b616452d0072b012cc7ae8fcae51e943f':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:23:08 -07:00
Joe Malin
a37bda7b61 am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '468d82bb7150996c8b2b4228d0e8d031f74e304b':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:20:45 -07:00
Romain Guy
31f0544293 Remove unnecessary lock to save 1 allocation per TextView 
Change-Id: I4fb885c61b44e57b8abaf3beedf61aaab3ef5d71
 2013-06-03 14:19:54 -07:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -07:00
John Spurlock
0f41c05ece am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:52:56 -07:00
John Spurlock
84a369c33b Fix awkward wording in AppWidgetManager docs. 
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
 2013-06-03 11:38:48 -04:00
John Spurlock
77624cd71f Fix awkward wording in AppWidgetManager docs. 
Change-Id: I6d1e180be666b3d88e88f357e8d79f6bbc0c9857
 2013-06-03 09:47:01 -04:00
Mikhail Naganov
d18607980d Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use" 2013-06-03 08:39:44 +00:00
Dirk Dougherty
eb47aac14c am 0f70bcfc: am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '0f70bcfce3eb291e95e2a70f9d353efa862796da':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 09:52:14 -07:00
Dirk Dougherty
0f70bcfce3 am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:35:13 -07:00
Dirk Dougherty
8ebfb8c9c3 am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:32:11 -07:00
Dirk Dougherty
fdc0c8618b am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'b18c725442e498a6447de37c3b9428b09837eda9':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:28:48 -07:00
Dirk Dougherty
b18c725442 am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:26:32 -07:00
Alan Viverette
20914c6ae9 Merge "Cleaning up AbsListView, fixing annotations and updating API calls." 2013-06-01 01:37:46 +00:00
Alan Viverette
66dbeac0e9 Merge "Split AbsListView.onTouchEvent into multiple methods for readability." 2013-06-01 01:37:01 +00:00
Adam Powell
3f7a6935d3 Merge "Fix a bug resolving the correct icon/logo in action bars" 2013-06-01 00:07:05 +00:00
Dianne Hackborn
99f414908f Merge "Clean up some temporary allocations." 2013-05-31 22:24:39 +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
Alan Viverette
8fa327a2fc Cleaning up AbsListView, fixing annotations and updating API calls. 
Change-Id: I87ce7714d0cc9e10a1466f474b828f2a27c57e15
 2013-05-31 14:53:13 -07:00
Alan Viverette
e7f30dc14d Split AbsListView.onTouchEvent into multiple methods for readability. 
Change-Id: Iaa28b70f9d708857e64c3d857c65aa075ab4208a
 2013-05-31 14:14:51 -07:00
Dirk Dougherty
4fad5c176a Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-31 21:08:45 +00:00
Jean Chalard
e507c840c8 am 44baed2d: am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev 
* commit '44baed2dc31d29c48f5d49577c109ca3903ad915':
  Improve the documentation for InputConnection.
 2013-05-30 19:49:23 -07:00
Jean Chalard
44baed2dc3 am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev 
* commit 'af9e5e5f618448f77f74bb36e0adbe88cb2ae156':
  Improve the documentation for InputConnection.
 2013-05-30 19:47:41 -07:00
Jean Chalard
af9e5e5f61 Merge "Improve the documentation for InputConnection." into jb-mr2-dev 2013-05-31 02:44:08 +00:00
Dianne Hackborn
390517be2d Clean up some temporary allocations. 
Yay to ArrayMap, letting me get rid of a bunch of temporary
iterators in core code paths like updateOomAdj.  (Now I definitely
need an ArraySet to finish that up.)

Also clean up various other things that are doing unnecessary
allocations, clean up some debug output, make more of the debug
output respect package filtering.

Change-Id: Ib4979faf4de8c7912739bc0937c3fa9e7bfcde67
 2013-05-30 19:26:42 -07:00
Satoshi Kataoka
96687db3da Merge "Resolve inconsistent conditions in InputMethodService" 2013-05-31 01:46:54 +00: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
Svetoslav
6a3c3b838b am 5fecbf9d: am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev 
* commit '5fecbf9d10cd6e40204187e6a2970ed113e48350':
  CalendarView header not updated on year change.
 2013-05-30 15:16:25 -07: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
Matthew Xie
703ea1862e am 0fdb05a7: am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit '0fdb05a770ce3ea0bd7f6ee9bae2283a38284607':
  Update javadoc to give app write better guidence
 2013-05-30 15:16:00 -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
Svetoslav
5fecbf9d10 am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev 
* commit 'ec58699413ebe4cc2a72a8aae3c420fb3d764457':
  CalendarView header not updated on year change.
 2013-05-30 12:50:15 -07:00
Svetoslav
ec58699413 Merge "CalendarView header not updated on year change." into jb-mr2-dev 2013-05-30 19:49:00 +00: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
Matthew Xie
0fdb05a770 am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit 'b190890a94dc2f0bd11da09f59550f86197f010a':
  Update javadoc to give app write better guidence
 2013-05-30 11:50:02 -07:00
Matthew Xie
b190890a94 Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 2013-05-30 18:45:42 +00:00
Matthew Xie
b30f91e38c Update javadoc to give app write better guidence 
Update javadoc of close methods of GATT cliet and server
Update javadoc of BluetoothAdapter
bug 8963528

Change-Id: I45ec618fd495225ed11a6171f33bfdc218397d4c
 2013-05-30 11:42:26 -07:00
Amith Yamasani
306fd7fa9e Merge "UX compliance for error messages" 2013-05-30 18:19:04 +00:00
Amith Yamasani
5a3915b06b UX compliance for error messages 
Bug: 9122154
Change-Id: I4a64750f11845a230321450bc6a2955cb73e3b6d
 2013-05-30 10:37:38 -07:00