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

908 Commits

Author SHA1 Message Date
Dianne Hackborn
f14dff1219 am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles. 
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.
 2011-06-10 07:45:38 -07:00
Dianne Hackborn
9980043e93 am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:18:07 -07:00
Dianne Hackborn
f795e9a86d Okay *now* really enforce the limit on non-public styles. 
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
 2011-06-09 16:17:53 -07:00
Dianne Hackborn
8821ba8606 Ummm... f*, stop breaking the build. 
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
 2011-06-09 16:09:15 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Xavier Ducrohet
48305f327f am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 12:49:55 -07:00
Xavier Ducrohet
45b662e1bc Merge 06942bc4 from hc-mr1. 
Layoutlib - use the new getParser callback when possible.

Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
 2011-06-08 17:11:40 -07:00
Xavier Ducrohet
beb5fb622b Merge 988eeeb5 from hc-mr1. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
 2011-06-08 17:10:11 -07:00
Xavier Ducrohet
f18e311ee5 am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.
 2011-06-07 17:17:11 -07:00
Xavier Ducrohet
abc8387168 am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'f6e479993e7c85265692829990ceb3879fbce424':
  Import the Layoutlib from hc-mr1.
 2011-06-06 18:11:33 -07:00
Xavier Ducrohet
67f09cd090 am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-06 18:08:40 -07:00
Xavier Ducrohet
ab3f5779ae am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-06 18:08:32 -07:00
Xavier Ducrohet
fb93ce9684 Import the Layoutlib from hc-mr1. 
This is squash commit of all the missing patches.

Change-Id: Ie081c46a173290646deddbde503a720d50c4400f
 2011-06-03 19:38:14 -07:00
Xavier Ducrohet
156a211b21 Cherrypick d1ed33c4 from hc-mr1. do not merge. 
Fix zombie threads in the Layoutlib.

Some widgets can create (indirectly) HandlerThread which are started
but never stopped.

This patch use the delegate methods to override the thread run method
to record which threads are started to be able to call quit() on them
after a render.

Note that we should really fix layoutlib_create to be able to call
the default implementation from a delegate to remove code duplication.

Change-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e
 2011-06-03 18:37:09 -07:00
Xavier Ducrohet
21726044a9 Cherrypick 5b61ea6b from hc-mr1 
Fix drawCircle in layoutlib.

Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
 2011-06-03 16:02:12 -07:00
Dianne Hackborn
8a7d44e824 resolved conflicts for merge of 54cb63e2 to master 
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
 2011-06-02 16:44:52 -07:00
Xavier Ducrohet
f174cd86bd LayoutLib: enable the LAYOUT_ONLY capability. 
Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
 2011-06-02 16:38:38 -07:00
Xavier Ducrohet
8f17523dca Merge dba35f1b from honeycomb-mr1. do not merge. 
Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe
LayoutLib: Properly configure KXmlParser to read UTF8
 2011-06-01 18:32:57 -07:00
Dianne Hackborn
54cb63e26e am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens. 
* commit '528c49f112dce5f9687f30a9751e783196eca0c6':
  Add "tv" density for 720p screens.
 2011-05-27 14:27:46 -07:00
Dianne Hackborn
b96cbbd11c Add "tv" density for 720p screens. 
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
 2011-05-27 13:40:26 -07:00
Jeff Brown
7d0fb57044 am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2 
* commit '16330e249663fed890df0e95fce4016c2971120a':
  Improve VelocityTracker numerical stability. (DO NOT MERGE)
 2011-05-25 14:42:06 -07:00
Xavier Ducrohet
228e471627 am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. 
* commit '34f5991ebe8b203f1720caf95889c15dd131d86e':
  Merge 6103e22c from honeycomb-mr1. do not merge.
 2011-05-24 12:28:38 -07:00
Dianne Hackborn
e2c7715c77 resolved conflicts for merge of bbca8133 to master 
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
 2011-05-24 11:27:11 -07:00
Xavier Ducrohet
34f5991ebe Merge 6103e22c from honeycomb-mr1. do not merge. 
LayoutLib: custom styles override the default style instead of replacing it.

Intead of reading either the custom or the default style for a widget, we
read both and use the values from the custom style if it exists, or
from the default style otherwise.

Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4
 2011-05-24 10:55:30 -07:00
Xavier Ducrohet
af83d4ecff am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. 
* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
 2011-05-24 10:54:35 -07:00
Xavier Ducrohet
c7b87766b2 Merge 2402ad60 from honeycomb-mr1. do not merge. 
LayoutLib: Fix Canvas_Delegate.native_concat().

Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
 2011-05-23 17:51:22 -07:00
Jeff Brown
5b2b4d9c0a Improve VelocityTracker numerical stability. (DO NOT MERGE) 
Replaced VelocityTracker with a faster and more accurate
native implementation.  This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation.  This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces.  The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
 2011-05-23 17:19:59 -07:00
Dianne Hackborn
bbca81334e am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2 
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.
 2011-05-23 16:16:54 -07:00
Dianne Hackborn
e360bb6bd8 Add "television" mode. 
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
 2011-05-23 15:11:08 -07:00
Xavier Ducrohet
5b9ec6871a am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 09:52:55 -07:00
Xavier Ducrohet
041fd74bea am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 09:52:52 -07:00
Xavier Ducrohet
9d9a7466cd am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 09:52:41 -07:00
Xavier Ducrohet
4c1e73b69a Merge e57aa434 from honeycomb-mr1. do not merge. 
LayoutLib: Fix issue where <include> with no layout params wouldn't display.

The issue is that the layout params from the root element of the included
layout should be used but this failed because loading the layout params
from the <include> tag didn't throw a RuntimeException in our modified
code (BridgeTypedArray).

Because we don't want to throw exception in general we only throw it
when reading the layout params of an include node which is pretty crappy,
but works for now.

Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
 2011-05-20 14:50:45 -07:00
Dianne Hackborn
161e67ff3b resolved conflicts for merge of 06a8ceac to master 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
 2011-05-19 21:44:52 -07:00
Dianne Hackborn
06a8ceacb0 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Xavier Ducrohet
d9af22e204 Merge 05b7b69c from honeycomb-mr1. do not merge. 
Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c
LayoutLib: support the new baseline/margin query API.
 2011-05-19 16:52:41 -07:00
Xavier Ducrohet
e172a3fc23 Merge 2fae858d from Honeycomb-mr1. do not merge. 
Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909
LayoutLib: implement data binding for most AdapterView
 2011-05-19 16:52:29 -07:00
Xavier Ducrohet
9f23e60b20 am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'a13462a947e634a6893119146a7271369e509586':
  LayoutLib: support the new baseline/margin query API.
 2011-05-19 08:58:18 -07:00
Xavier Ducrohet
a13462a947 am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
  LayoutLib: support the new baseline/margin query API.
 2011-05-18 17:51:31 -07:00
Xavier Ducrohet
b18e700cb9 am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
  LayoutLib: support the new baseline/margin query API.
 2011-05-18 17:40:08 -07:00
Xavier Ducrohet
05b7b69c6c LayoutLib: support the new baseline/margin query API. 
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
 2011-05-16 16:29:03 -07:00
Xavier Ducrohet
8c2f85d941 am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit 'd00541603fbbb4e38264e75a2b6abf8705efeb49':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:43:37 -07:00
Xavier Ducrohet
d00541603f am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:36:16 -07:00
Xavier Ducrohet
738c5e6072 am 2fae858d: LayoutLib: implement data binding for most AdapterView 
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
 2011-05-13 16:30:44 -07:00
Xavier Ducrohet
2fae858db5 LayoutLib: implement data binding for most AdapterView 
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
 2011-05-13 15:55:49 -07:00
Dianne Hackborn
2e4a3236a7 am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
 2011-05-13 11:21:26 -07:00
Dianne Hackborn
ebff8f92f1 DO NOT MERGE. Integrate add new screen width/height in "dp" configs. 
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
 2011-05-12 18:39:51 -07:00
Conley Owens
779fa1515d am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:48:45 -07:00