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

2949 Commits

Author SHA1 Message Date
Yabin Cui
51b3832756 am d493fa6d: am 537888be: Merge "kill HAVE_LOCALTIME_R" 
* commit 'd493fa6d797cbdd805f009f7403f2a046190b5d4':
  kill HAVE_LOCALTIME_R
 2014-11-14 00:47:09 +00:00
Yabin Cui
d493fa6d79 am 537888be: Merge "kill HAVE_LOCALTIME_R" 
* commit '537888be7d5cfa6bfa9ddd459a622ea208339735':
  kill HAVE_LOCALTIME_R
 2014-11-13 19:05:06 +00:00
Yabin Cui
25d58a9357 kill HAVE_LOCALTIME_R 
Bug: 18361583
Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b
 2014-11-13 09:57:22 -08:00
Dan Albert
45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.
 2014-11-12 21:31:33 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Jeff Brown
70170261cb am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7 
automerge: a473878

* commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 02:46:10 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 00:24:43 +00:00
Adam Lesinski
5930c5cafd am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev automerge: 1e2e05b 
automerge: be6c125

* commit 'be6c125783686be593e958725249ffcff5717fc4':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 22:36:46 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Adam Lesinski
be6c125783 am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
automerge: 1e2e05b

* commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 22:15:44 +00:00
Adam Lesinski
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +00:00
Adam Lesinski
5097b28975 am d660e05c: am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt" 
* commit 'd660e05c84c7412336ca5510ff9514357e9ba074':
  Fixing NULL pointer access causing segmentation fault in aapt
 2014-11-11 19:57:25 +00:00
Adam Lesinski
d660e05c84 am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt" 
* commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67':
  Fixing NULL pointer access causing segmentation fault in aapt
 2014-11-11 19:53:52 +00:00
Adam Lesinski
8aa93764ea Merge "Fixing NULL pointer access causing segmentation fault in aapt" 2014-11-11 19:36:20 +00:00
Deepanshu Gupta
83e5329b3b am 028372b0: am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev automerge: 8f6e7a8 
* commit '028372b070d3d293ac6b1b42681339bee7848407':
  Don't skip loading object animator.
 2014-11-11 18:39:39 +00:00
Deepanshu Gupta
028372b070 am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
automerge: 8f6e7a8

* commit '8f6e7a868ce7715184a0d9239c6a72d269083c38':
  Don't skip loading object animator.
 2014-11-11 18:16:28 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator. 
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
 2014-11-11 15:21:19 +00:00
Diego Perez
4985297bd7 Merge "Add new parameter to the render method to allow forcing a measure pass." 2014-11-11 09:51:02 +00:00
Adam Lesinski
cbaa1c617b am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 
* commit '6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c':
  split-select: fix OSX build
 2014-11-11 03:01:46 +00:00
Adam Lesinski
6ba4c9d91b am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 
* commit 'c78b33d01187336d960457980acb05cac86241be':
  split-select: fix OSX build
 2014-11-11 02:55:12 +00:00
Yabin Cui
77381ac1d1 am da98fbc3: am 1521303f: Merge "kill OS_CASE_SENSITIVE" 
* commit 'da98fbc33a7bd11710207aaa3aa34351ec9f0747':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:25:29 +00:00
Yabin Cui
da98fbc33a am 1521303f: Merge "kill OS_CASE_SENSITIVE" 
* commit '1521303f0e4264c1d4ede0250620ad236d485ae0':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:10:12 +00:00
Adam Lesinski
a2bb565db5 AAPT: Ignore densities specified in -c flag 
The --preferred-density flag knows how to handle missing resources of
specific densities. Using -c with a density leads to missing resources.

Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8
 2014-11-10 17:56:11 -08:00
Adam Lesinski
c3344e8a6d split-select: fix OSX build 
Clang is a bit stricter about what template definition it chooses
for mixed types that are normally possible to cast between.
Operations like std::find(int iterator, int iterator, enum) will fail,
as Clang won't implicitly cast an enum to an int here.

Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4
 2014-11-10 17:39:47 -08:00
Yabin Cui
fb8e2b1745 kill OS_CASE_SENSITIVE 
Bug: 18314594
Change-Id: Ib11b45d2597b2576bc7df2d0167ce1bbd1449523
 2014-11-10 16:08:50 -08:00
Deepanshu Gupta
de4731eafa am fb5877a4: am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe automerge: 1f33b2f 
* commit 'fb5877a4e7ac63df741489484f1642af0d592397':
  Fix setting styles in custom views.
 2014-11-11 00:04:35 +00:00
Deepanshu Gupta
8d7a834dff am 7cc11f8b: am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 automerge: 1adeba2 
* commit '7cc11f8bf3aedeb199331dca064c89ea58312a68':
  Add primitive shadows support to LayoutLib
 2014-11-10 23:59:50 +00:00
Deepanshu Gupta
0ca185adaf am 9713d740: am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 automerge: aa53920 
* commit '9713d740182f37f15849997979384fde00a1f9c1':
  Remove needlessly thrown IOException.
 2014-11-10 23:59:45 +00:00
Deepanshu Gupta
fb5877a4e7 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe 
automerge: 1f33b2f

* commit '1f33b2f6f61f66b751d6ecb2660bed8f36c91986':
  Fix setting styles in custom views.
 2014-11-10 23:57:27 +00:00
Deepanshu Gupta
7cc11f8bf3 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 
automerge: 1adeba2

* commit '1adeba2c7399e619760b413d810de9c6371b3159':
  Add primitive shadows support to LayoutLib
 2014-11-10 23:56:18 +00:00
Deepanshu Gupta
9713d74018 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 
automerge: aa53920

* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
  Remove needlessly thrown IOException.
 2014-11-10 23:54:59 +00:00
Adam Lesinski
16b85b8d7a am 9687153d: Merge "Merge commit \'fa31eb2c\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '9687153de355343d40f5ab14a74fb17954cff373':
  split-select: Fix rules generated for anydpi density
 2014-11-10 22:38:47 +00:00
Adam Lesinski
4d29c66930 Merge commit 'fa31eb2c' into manualmerge 
Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
 2014-11-10 14:32:11 -08:00
Dan Sandler
f2d9b00832 am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
  Fix inset hinting when adding window
 2014-11-10 22:13:03 +00:00
Deepanshu Gupta
7d3d5feb31 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 
* commit '4c0f0e6c852dd933bcfaf95380cca49a46fa3912':
  Fix setting styles in custom views.
 2014-11-10 22:05:27 +00:00
Deepanshu Gupta
828db35568 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac 
* commit '3cf0640d944a0718b9e29a2134a577e72a9432b4':
  Add primitive shadows support to LayoutLib
 2014-11-10 22:05:23 +00:00
Deepanshu Gupta
a09dda8162 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
  Remove needlessly thrown IOException.
 2014-11-10 22:05:16 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Deepanshu Gupta
4c0f0e6c85 Merge "Fix setting styles in custom views." into lmp-dev 
automerge: 5c22a79

* commit '5c22a79baf81727b56a85a194d678c18449b5150':
  Fix setting styles in custom views.
 2014-11-10 21:00:43 +00:00
Deepanshu Gupta
3cf0640d94 Merge "Add primitive shadows support to LayoutLib" into lmp-dev 
automerge: 97c04ac

* commit '97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
  Add primitive shadows support to LayoutLib
 2014-11-10 20:58:58 +00:00
Deepanshu Gupta
0e3925dfb3 Merge "Remove needlessly thrown IOException." into lmp-dev 
automerge: f305d2c

* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
  Remove needlessly thrown IOException.
 2014-11-10 20:56:36 +00:00
Deepanshu Gupta
8657baa06d Fix setting styles in custom views. 
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
 2014-11-10 20:10:55 +00:00
Adam Lesinski
a674a1ee79 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 2014-11-10 19:45:28 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window 
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
 2014-11-10 17:46:57 +01:00
Deepanshu Gupta
796e9b7f99 Add primitive shadows support to LayoutLib 
The shadows rendered are not the same as rendered by the framework. The
main purpose of the shadows here is let the user know when shadows will
be cast.

Currently rectangular shadows are available in only two intensities. Any
elevation below 10dp uses one shadow and any elevation over 10 dp uses
the other.

Also, even though the code for arbitrary shapes exist, it doesn't quite
work yet. No shadows are visible when that code is run.

Change-Id: Ie8235ffccf1d3809713f5d8f82afde434817d6b2
 2014-11-07 22:26:11 +00:00
Jörgen Ekström
da44fe0e1f Fixing NULL pointer access causing segmentation fault in aapt 
In cases where resource packages are generated which does
not have public resources for all resource types - NULL
pointers sneaks into the mOrderedConfigs vector causing
the aapt tool to crash. The solution in this fix simply
ignores the NULL elements when later processing the sorted
vector.

The NULL elements are inserted during applyPublicEntryOrder
function call

Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
 2014-11-07 13:41:06 +00:00
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00