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

2837 Commits

Author SHA1 Message Date
Deepanshu Gupta
fbff0191f6 am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit '58238d900b43f6b780890b7ea93c11a877936ed7':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:17:00 +00:00
Deepanshu Gupta
9ab79551ac am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:06:59 +00:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
 2014-11-21 00:43:51 +00:00
Deepanshu Gupta
ddc83dfa8f am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
* commit '4104abf875e16ad54c248ce602e573d2144732dd':
  Fix setTextAppearance for styles with dots.
 2014-11-19 23:00:43 +00:00
Deepanshu Gupta
a0bc2e7e3c am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-19 23:00:39 +00:00
Deepanshu Gupta
4104abf875 Merge "Fix setTextAppearance for styles with dots." into lmp-dev 2014-11-19 22:30:20 +00:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Deepanshu Gupta
2c9fbdd29c Fix setTextAppearance for styles with dots. 
Bug: http://b.android.com/78842
Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
 2014-11-18 22:52:10 +00:00
Deepanshu Gupta
12b6d29b7b LayoutLib: Stub AM/PM keycodes in Time Picker. 
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.

Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
 2014-11-18 22:02:40 +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
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
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
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
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
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
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
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
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
4d29c66930 Merge commit 'fa31eb2c' into manualmerge 
Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
 2014-11-10 14:32:11 -08: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
Jeff Brown
5ce1cb240b Move device admin max screen off timeout to internal interface. 
The setting was previously exposed in IPowerManager but it
doesn't need to be there.

Bug: 17656076
Change-Id: If3ed0cbe89f67c60aa00376be0c54b1bd9656144
 2014-11-06 19:34:21 -08:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Adam Lesinski
dcdfe9fef4 split-select: Fix rules generated for anydpi density 
Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
 2014-11-06 14:57:34 -08:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Deepanshu Gupta
9173c8a2e9 Remove needlessly thrown IOException. 
Change-Id: If34986367554c98f96f6f9a1088f5e25077a1be1
 2014-11-06 11:43:37 -08:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00