2692 Commits

Author SHA1 Message Date
Deepanshu Gupta
f708d27fa0 resolved conflicts for merge of fb30a783 to lmp-mr1-dev
Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
2014-12-04 10:30:40 +05:30
Deepanshu Gupta
fb30a783d3 am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-dev
* commit '7e55c29281f8a62154451e87b45d95ec5f97c5ac':
  Fix typos in previous bugfixes.
2014-12-03 20:58:19 +00:00
Adam Lesinski
62c5df52e7 AAPT: Add pathMotion custom classes to Proguard Keep set
Bug:18590044
Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57
2014-12-02 16:23:59 -08:00
Adam Lesinski
4c488ff931 AAPT: Add custom transition classes to Proguard keep set
Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c
2014-12-02 15:40:17 -08: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
Deepanshu Gupta
cb09bc45c5 Fix typos in previous bugfixes.
The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes
them.
2014-11-20 13:35:47 +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
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
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +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
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
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
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
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
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
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
2014-11-04 01:08:23 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
2014-11-04 00:51:51 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
2014-11-04 00:49:43 +00:00
Adam Lesinski
de7de47fef Add error checking to aapt for split generation
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
2014-11-03 15:55:44 -08:00
Adam Lesinski
f7ffcaa7a4 Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Deepanshu Gupta
9b64954cb5 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 2014-11-03 23:15:03 +00:00
Deepanshu Gupta
c23487aa18 Merge "Support framework menus in ActionBar" into lmp-dev 2014-11-03 23:14:46 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Adam Lesinski
c3dc0b57b8 Build the split-select tool without C++11 support
It was complicated to get the tool building on Windows, Linux,
and OSX with C++11 support.

OSX uses Clang to build C++11 binaries, which requires the libc++
standard library. Since most of the dependencies of this program
are built against libstdc++, this was difficult to resolve.

Now we build without C++11 support.

Change-Id: I4e537c113734508a8f480a1c402ed237de4f0e60
2014-11-03 12:09:58 -08:00
Adam Lesinski
4bf58108d4 Fix issues that will be present in C++11
- char16_t is a distinct type, so stay consistent
  with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
  Since we mmap and cast data structures onto raw memory,
  we need a precise definition (uint16_t), so we cast between
  that (and static_assert that they are the same size).

Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
2014-11-03 11:49:47 -08:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily.
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
2014-11-01 14:10:46 +00:00
Jeff Brown
e333e674a7 Add a function to boost screen brightness temporarily.
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds.  This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00