140336 Commits

Author SHA1 Message Date
Robert Ly
bf47a6c4cd docs: add whitelisting instructions and new index icons
Change-Id: If720e2a5c3cae1d5cceff397d06001e551443fce
2014-06-21 00:56:48 -07:00
Michael Kolb
db9fed74c2 Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Michael Kolb
437d31390b Make WindowInsets.isRound work with emulator
Bug: 15775489

Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75
2014-06-20 15:13:09 -07:00
Robert Ly
8c573178df Merge "docs: fix l preview bugs" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
c8590ffdc3 docs: fix l preview bugs
Change-Id: Ic89fea620ba458c604ccdeeb6da471c807a71fef
2014-06-20 14:11:29 -07:00
Ruben Brunk
ed81ebc3c5 Merge "camera2: Fix frame ID returned by legacy mode shim." 2014-06-20 21:00:34 +00:00
Ruben Brunk
53284d5816 camera2: Fix frame ID returned by legacy mode shim.
Bug: 15116722
Change-Id: I59e9ac43b192c41f83fe350a93aa860b2619dfe5
2014-06-23 11:36:10 -07:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader.
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
2014-06-20 15:59:00 -07:00
Michael Kolb
270c099faf Merge "Move emulator check & save system properties access" into klp-modular-dev 2014-06-20 20:43:34 +00:00
Michael Kolb
22dfdcb7ee Move emulator check & save system properties access
Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
2014-06-20 15:39:04 -07: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
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
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
Calin Juravle
a06f5fa656 Merge "Fix the initialization of some profile properties" 2014-06-20 03:03:45 +00:00
Ruben Brunk
5776aafc7e camera2: Add AE antibanding + fps range metadata.
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
2014-06-19 19:20:36 -07: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
Igor Murashkin
49b2b13510 camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null

Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
2014-06-19 17:36:07 -07:00
Yorke Lee
e85eee8234 Merge "Update PinnedPositions API (2/2)" 2014-06-20 00:30:35 +00:00
Yorke Lee
cadbe4ccde Update PinnedPositions API (2/2)
Remove the now unnecessary UPDATE_API and STAR_WHEN_PINNING fields
Make PinnedPositions public API once more

Bug: 15593967

Change-Id: I5eabee6977b93b5ddbf79ec8c01649f20b02abf1
2014-06-23 16:22:26 -07:00
smain@google.com
78dfcb3aba Merge "revised homepage to use static version of top banner" into klp-modular-dev 2014-06-20 00:30:35 +00:00
smain@google.com
c99f100f29 revised homepage to use static version of top banner
Change-Id: Id337f67640a648cf28cbf20ccd2dba1524475aae
2014-06-19 18:26:52 -07:00
Baligh Uddin
0b1db563d4 Import translations. DO NOT MERGE
Change-Id: I2870034a45b585ddd84a1d35a0efdd99f1dcd1d8
Auto-generated-cl: translation import
2014-06-19 17:24:40 -07:00
Craig Mautner
90c9fffc95 Merge "Do not delete stack if empty task is being reused." into klp-modular-dev 2014-06-20 00:24:32 +00:00
Craig Mautner
362449af58 Do not delete stack if empty task is being reused.
If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
2014-06-20 14:04:39 -07:00
Joe Fernandez
2d7b3dedd0 Merge "ExoPlayer developer guide" into klp-docs 2014-06-20 00:24:32 +00:00
Joe Fernandez
afe3bb96f2 ExoPlayer developer guide
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
2014-06-20 14:28:54 -07:00
Baligh Uddin
351d7e2e38 Import translations. DO NOT MERGE
Change-Id: I5c10b06f4e78acd1f479d0634e6bc43209d5f978
Auto-generated-cl: translation import
2014-06-19 17:23:45 -07:00
Vineeta Srivastava
97a6c20a6a Merge "Removed hack for fingerprint HAL." 2014-06-20 00:20:03 +00:00
Alan Viverette
24c492d3bb Merge "Add tileModeX/Y attrs to BitmapDrawable, tint to ShapeDrawable" 2014-06-23 17:14:09 +00:00
Craig Stout
fe80e63157 Update leanback alert dialogs.
Now based on Material instead of Holo.

b/15418510

Change-Id: I69103b429ff1b4f66b3968fa64e652182833652f
2014-06-23 19:58:31 +00:00
Calin Juravle
fc0fa9abd2 am ac777c82: am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties"
* commit 'ac777c821958e68a3be41d11d97aefa9182eab5a':
  Fix the initialization of some profile properties
2014-06-23 19:54:05 +00:00
Alan Viverette
22594f0972 Add tileModeX/Y attrs to BitmapDrawable, tint to ShapeDrawable
Change-Id: I1c9efe39bfd5286230cee8354822db81f05186e4
2014-06-23 12:47:43 -07:00
Baligh Uddin
a559f2af16 am 15aca0aa: (-s ours) am 858b47ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '15aca0aa6db5517c14d973f096aaf12e6930c681':
  Import translations. DO NOT MERGE
2014-06-23 19:45:48 +00:00
Baligh Uddin
8187d55bba am 96e98d41: (-s ours) am 2d91bc23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '96e98d4170ee5f601be999a63e88db41c2bbb01f':
  Import translations. DO NOT MERGE
2014-06-23 19:45:43 +00:00