140143 Commits

Author SHA1 Message Date
Michael Kolb
8dab261d81 am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev
* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
  Move emulator check & save system properties access
2014-06-22 01:16:19 +00:00
Craig Mautner
5afcd4df22 resolved conflicts for merge of aaadf922 to master
Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
2014-06-21 18:11:33 -07:00
Deepanshu Gupta
a88738ff52 am 3daec197: Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev
* commit '3daec1972493c1e867c6cac7f4a2a43a157d52b9':
  LayoutLib: Better support for compact/elegant fonts.
2014-06-21 23:35:51 +00:00
Deepanshu Gupta
4a2ff7a4d8 am f791b120: Merge "Material navigation bar for layoutlib." into lmp-preview-dev
* commit 'f791b1205192e525590f72c465e7e4c185112eb0':
  Material navigation bar for layoutlib.
2014-06-21 23:35:43 +00:00
Michael Kolb
c0fcf109f0 am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev
* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
  Make WindowInsets.isRound work with emulator
2014-06-21 20:24:28 +00:00
Joe Fernandez
4bae7d39ff am 82d013d4: am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
* commit '82d013d45ab86ee1a4e1a64960f6ac1260d66a66':
  ExoPlayer developer guide
2014-06-21 20:24:23 +00:00
Robert Ly
8cadff247f am 5c26b33e: am d8b94456: fix build
* commit '5c26b33e4abfc820677f6af566bb9952a535efd7':
  fix build
2014-06-21 20:24:18 +00:00
Robert Ly
8f94d781bf am 9e51442c: am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev
* commit '9e51442ca5ee1bb0ebdae656d45657bdc17f3666':
  docs: fix l preview bugs
2014-06-21 20:24:12 +00:00
Robert Ly
3ad3a485f3 am 31dde385: am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev
* commit '31dde385674be85c98add60d020b13572d18de1a':
  docs: fix margins and add partners back
2014-06-21 20:24:06 +00:00
Chet Haase
3aff2a0813 Avoid resetting gradient state when not actually rebuilding it
Previous logic in GradientDrawable around rebuilding the gradient path
was incorrect, but it happened to work because of when it was called
(after ensureValidRect() in the draw() method). Further reliance on this
logic outside of the drawing cycle (in the new getOutline() method) caused
the side-effect to surface as we now clear the dirty flag without actually
rebuilding the gradient.

Fix avoids resetting the flag outside of ensureValidRect() where it belongs.

Issue #15508378 Quantum ui having issues with viewing comments on facebook app

Change-Id: Ia944d3de7e3c0920fed040188e8c1cc1bcce498d
2014-06-21 08:31:03 -07:00
George Mount
7a73fda47d Merge "API Review: Change View viewName attribute to transitionName." 2014-06-21 03:15:09 +00:00
Deepanshu Gupta
b337295654 Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev 2014-06-20 21:00:34 +00:00
Deepanshu Gupta
0a1335d770 Merge "Material navigation bar for layoutlib." into lmp-preview-dev 2014-06-20 20:43:34 +00:00
Ji-Hwan Lee
8865275ebc DO NOT MERGE: Use main looper for PackageMonitor
This is to work-around the issue that TvInputManagerService does not
receive package change callbacks from PackageMonitor.

In ATV emulator build, the background thread is blocked at
android_location_GpsLocationProvider_init(), and PackageMonitor that uses
background thread fails to handle broadcast intent.

Bug: 15767453
Change-Id: Ieef00cedf1357d57e4217ec202d50655ba3aa35a
2014-06-21 06:31:12 +09:00
Ji-Hwan Lee
0ceb7e4755 Register PackageMonitor when system services are ready
Bug: 15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
2014-06-21 06:30:49 +09:00
Dan Albert
a642a9ea3b am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit 'd24f557798d04bdd50f2a45e48b70b009a205b4a':
  Use openssl's SHA1 instead of bionic's.
2014-06-20 19:53:36 +00:00
Brian Carlstrom
0547ce55eb Treat missing package usage data as a separate case
Bug: 15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
2014-06-20 12:53:19 -07:00
Baligh Uddin
1c74e20db1 am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
  Import translations. DO NOT MERGE
2014-06-20 19:48:52 +00:00
Robert Ly
149c1b09ee am c9334fb1: fix typo on lmp-prev page
* commit 'c9334fb1b884031ad0f522085542e80e71f73685':
  fix typo on lmp-prev page
2014-06-20 19:48:48 +00:00
Robert Ly
f6c5ee4079 am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev
* commit '3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
  add new image and landing page for l-preview
2014-06-20 19:48:40 +00:00
Nicolas Prevot
f5fb7035c4 Merge "Show the icon of the personal space." 2014-06-20 18:26:34 +00:00
Nicolas Prevot
88cc346d06 Show the icon of the personal space.
In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c
2014-06-23 12:25:07 +01:00
Robert Ly
2fe74af91c am 12426cff: am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev
* commit '12426cff730ec2e691005407b911ebe71fbb268d':
  docs: l-preview fixes
2014-06-23 10:40:23 +00:00
Robert Ly
aac10712f1 am 2061f0a2: am 0cff6256: docs: more auto updates
* commit '2061f0a2dfdda9a9bf36d99d0b67f8d3821cdef7':
  docs: more auto updates
2014-06-23 10:40:14 +00:00
George Mount
125578a863 API Review: Change View viewName attribute to transitionName.
Bug 15548520

Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378
2014-06-20 11:01:01 -07:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
2014-06-20 16:34:36 +00:00
Elliott Hughes
ff6b0e2472 am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface
2014-06-20 16:30:40 +00:00
smain@google.com
4d30b1e663 make buttons "primary" red
Change-Id: Ife5f2b565f52621df953593b9b3bd7cc05500f81
2014-06-19 22:33:50 -07:00
Alexandra Gherghina
aeb0ed7467 Merge "Adds cross-profile intent filters for the Settings app" 2014-06-20 04:43:13 +00:00
Jungshik Jang
7f0a1c54a8 Fix missing param to system audio mode action.
Change-Id: I3a4aa3dcdcf8378b51e86367f9bca1fc87a28603
2014-06-23 16:00:07 +09:00
Calin Juravle
a06f5fa656 Merge "Fix the initialization of some profile properties" 2014-06-20 03:03:45 +00:00
Dan Albert
d24f557798 Merge "Use openssl's SHA1 instead of bionic's." 2014-06-20 02:09:57 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Robert Ly
448f823e20 Merge "docs: fix margins and add partners back" into klp-modular-dev 2014-06-20 02:09:17 +00:00
Robert Ly
3192cff692 docs: fix margins and add partners back
Change-Id: I0430079f136fb6197a9a53e44f55a0292d8975a7
2014-06-19 21:23:46 -07:00
Dirk Dougherty
bf66c17e4a Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 2014-06-20 02:09:17 +00:00
Cheuksan Wang
87487466af Add an API call to update the status of a pending outbound SMS message and
resend by PSTN if necessary.

Change-Id: Id847b182874bef057473acf293cee43d9d55f7ab
2014-06-19 18:51:13 -07:00
Winson Chung
89bb755aed Merge "Ensuring that we unload all resources after a transition." 2014-06-20 00:30:35 +00:00
Winson Chung
653b0d6a59 Ensuring that we unload all resources after a transition.
- Fixed case where we weren't deleting task data after it was removed via a package event
- Reducing time for dismiss button to appear
- Working around animation issue where we appear to see frames before the animation starts (perhaps it is posted now?)

Change-Id: I1dc0e203485f517e7384b0f7ee08979bfd286013
2014-06-20 19:03:16 -07:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ying Wang
7c0e6219c3 Fix build.
Change-Id: I2b161a4020862d83347d5a8989467c612fff08db
2014-06-20 17:30:45 -07:00
Dianne Hackborn
07f08d5043 Merge "Add some wifi tracking to battery stats." 2014-06-20 02:09:17 +00:00
Dan Albert
8b40ea5fc6 am 70c47d70: (-s ours) am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit '70c47d70257bb9c448ef935c0c3ae7dfe2f9c07e':
  Use openssl's SHA1 instead of bionic's.
2014-06-20 23:21:52 +00:00
Dianne Hackborn
3251b90752 Add some wifi tracking to battery stats.
Now track supplicant state and wifi signal strength.
Output looks like this:

         +12m45s235ms (1) 095 +wifi_full_lock +wifi_running wifi_signal_strength=3 wifi_suppl=scanning
         +12m46s095ms (1) 095 -wifi_full_lock wifi_suppl=associated
         +12m46s469ms (2) 095 wifi_suppl=completed +proc=u0a74:"com.google.android.videos"
         +12m52s103ms (1) 095 +wifi_full_lock wifi_suppl=disconn

Also modify history dump so that when we hit a RESET or START
command, we clear our previous history data, so the next event
will include new data.  This means if you are scanning through
the output, you must at this point clear any binary stats you
have like "running" or "wake_lock" or else you will continue to
think they are on until whatever point later they get turned on
and then back off.

And a small bug fix in proc stats that would cause the system
process to crash.

Change-Id: Ibec416a1ef786d428bd0d1d86e6e3296c41f7648
2014-06-20 16:01:21 -07:00
Chris Craik
3281442aa7 Merge "Wrap ViewGroup content in save/restore to protect composited children" 2014-06-20 02:09:17 +00:00
Chris Craik
80d4902196 Wrap ViewGroup content in save/restore to protect composited children
bug:15570351

Pos Z composited children are drawn before the primary restore for a
RenderNode. This means that without an additional save/restore (which
wraps the content) they aren't protected from transformations/clips
that happen within the ViewGroup's DisplayList.

Also changes RenderNode to use OpenGLRenderer tag for displaylist
dumping consistency, and simplifies the entry points into RenderNode
drawing, since the distinction between tree root vs tree internal is
no longer important.

Change-Id: I2621eba0592c74d71f85a91a4ab3d0da2d7468d3
2014-06-20 16:18:58 -07:00
Andres Morales
6ab7c1e7da Merge "Make unlock api take String instead of int codes" 2014-06-20 20:43:34 +00:00
smain@google.com
c9ec3277d5 am 02616aff: am 4d30b1e6: make buttons "primary" red
* commit '02616aff5acac6f12864716baaa8eab656367afa':
  make buttons "primary" red
2014-06-20 23:14:22 +00:00
smain@google.com
f91441849b am a787d796: am 78dfcb3a: Merge "revised homepage to use static version of top banner" into klp-modular-dev
* commit 'a787d796c254c615b6637b66e81d377dd8de203f':
  revised homepage to use static version of top banner
2014-06-20 23:14:17 +00:00
Andres Morales
d8cf53f87d Make unlock api take String instead of int codes
int code method not exposed to third parties

Change-Id: I18ad0703be9d06664db3fd00a6435f789979fe73
2014-06-20 16:13:16 -07:00