Commit Graph

39417 Commits

Author SHA1 Message Date
Russ Schnapp
7359b0b885 Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras" 2014-05-08 00:24:10 +00:00
Craig Mautner
41db4a77fa Use new doccentric flags and attributes in Sharing
Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.

Fixes bug 14463859.

Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
2014-05-07 17:20:56 -07:00
Alan Viverette
e80e2fc71e am 91c091cf: Merge "State based animators for Views"
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
  State based animators for Views
2014-05-08 00:01:07 +00:00
Alan Viverette
b466977765 Merge "State based animators for Views" 2014-05-07 23:58:15 +00:00
Yigit Boyar
f4c5bf30b4 State based animators for Views
Set quantum theme buttons to elevate 2dp on press

Change-Id: Ibf4f5ef166b901382c304d392eba075836a96a35
2014-05-07 16:52:17 -07:00
John Reck
bf4c565cda am c58ab5f6: Merge "Allow all loopers to be RT-accelerated"
* commit 'c58ab5f60e5fcc845ceb1e146372a1dbf99cbb82':
  Allow all loopers to be RT-accelerated
2014-05-07 23:45:12 +00:00
Jason Monk
40878bebf5 am 59e6e796: Merge "Fix Docs breakage"
* commit '59e6e796dae4e3e6436c7c714510155931183990':
  Fix Docs breakage
2014-05-07 23:45:08 +00:00
Vinod Krishnan
6c6fd8ad50 am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
  Adding a HeartRate Feature
2014-05-07 23:44:59 +00:00
Brian Carlstrom
ea4facab1c am a599245c: Merge "resolved conflicts for merge of 3bbef521 to master"
* commit 'a599245ca0d4886842bff4257e254adaf6743e5f':
  Use package usage information to decide what dex files to optimize in PackageManagerService
2014-05-07 23:43:38 +00:00
John Reck
14d5767c37 am 9cdc11c6: Merge "Cleanup attachFunctor"
* commit '9cdc11c684756336734399dac16476a24b8348ef':
  Cleanup attachFunctor
2014-05-07 23:43:30 +00:00
Zhijun He
02157bb93f am eb440873: Camera: remove some DNG tags
* commit 'eb44087344cb545f97f78b802dc91bfec252f0f7':
  Camera: remove some DNG tags
2014-05-07 23:42:39 +00:00
John Reck
b53f2b7882 am 47003dcd: Merge "Implement TODO(romainguy)"
* commit '47003dcd3993f06416c63b2a781ef43c6f5feed3':
  Implement TODO(romainguy)
2014-05-07 23:42:32 +00:00
Mindy Pereira
101e379318 am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev
* commit '07763e305404bce16df500e1a65493d2f2b7d0c9':
  Make distance count when dismissing swipedismisslayout
2014-05-07 23:42:00 +00:00
Jason Monk
41a2e33744 Fix Docs breakage
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.

Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
2014-05-07 19:18:38 -04:00
John Reck
ae493d967f Merge "Allow all loopers to be RT-accelerated" 2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
2014-05-07 22:57:45 +00:00
John Reck
030d619aaa Allow all loopers to be RT-accelerated
Bug: 14445956

Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
2014-05-07 15:46:36 -07:00
Mindy Pereira
07763e3054 Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 2014-05-07 22:46:02 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
2014-05-07 18:41:13 -04:00
George Mount
6de56bb07e Fix mismatch in Transition ID/instances
Bug 14597573

In a Transition, when a View is removed from a Scene
and that View has an ID in common with another View
in the end Scene, it will be matched, even if the
View in the start Scene already had a matching View
by instance. This CL prevents a match by ID when an
instance match is available.

Future: disable matching when two views have the
same ID.

Change-Id: I0e51d1f2d0a2d05d09e8e135f090d0e1b2a67efc
2014-05-07 15:09:08 -07:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
2014-05-07 14:46:40 -07:00
John Reck
832b151465 Cleanup attachFunctor
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
Emily Bernier
394a6cdd98 New user restrictions for EDU
New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
2014-05-07 17:04:58 -04:00
John Reck
63a0667325 Implement TODO(romainguy)
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
2014-05-07 13:45:54 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
2014-05-07 13:20:23 -07:00
Russ Schnapp
c43a6bbe88 Fix erroneous javadoc example SyncRequest.Builder.setExtras
Change-Id: I2072a729b2db48d336590363509d9b8e9047c0bc
2014-05-07 12:56:13 -07:00
Jason Monk
1a285ee293 am 6e6d1f21: Merge "Make Lock Task API public."
* commit '6e6d1f214766bbf00b4b0298d95ec1b42461e470':
  Make Lock Task API public.
2014-05-07 19:22:38 +00:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00
Jason Monk
a57e5e006b Make Lock Task API public.
Change-Id: Ieaf944dc69e206e091d8257e0f92013b082ceaac
2014-05-07 15:15:53 -04:00
Jason Monk
4ef10931b4 am 059637c4: Merge "Make proxy API public"
* commit '059637c4970bdbed19689a5e9ecb40a9ebe5a739':
  Make proxy API public
2014-05-07 18:57:01 +00:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
207900c23b Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Amith Yamasani
fbad7705ba am 0e5d4e4a: Merge "Fix javadoc typo"
* commit '0e5d4e4ae4e7c51f383eb1ef2e3941dcdd8096aa':
  Fix javadoc typo
2014-05-07 17:30:04 +00:00
Amith Yamasani
007bbc0ed3 Fix javadoc typo
Use @return, not @returns

Change-Id: I6c8fab2d236cf9c68c79090d3830bc3e01c8aa6f
2014-05-07 10:23:44 -07:00
Mindy Pereira
072c6033fd Make distance count when dismissing swipedismisslayout
verify the user's gesture took up at least 40% of the screen
before dismissing
Part of b/14319825 Cliff guard against accidental card dismissals

Works in conjunction with GridViewPager change:
https://googleplex-android-review.git.corp.google.com/#/c/461036/
Change-Id: Id8ff02d0a2d727b54c9950ad14ddef7a110f4eef
2014-05-07 10:06:55 -07:00
Guang Zhu
f8896f187d am 3e210d17: resolved conflicts for merge of 1e8a87dd to master
* commit '3e210d179b80c1d09bb9b44c0aefde1daf3801cf':
  send accessibility events on view property invalidation
2014-05-07 16:56:39 +00:00
Guang Zhu
4297409e45 resolved conflicts for merge of 1e8a87dd to master
Change-Id: Id51218b4e2ca06344b5e7596ebde355fba9cfa54
2014-05-07 09:51:11 -07:00
Craig Mautner
cf24765664 am d5a99922: Merge "Add attributes and flags for DocCentric."
* commit 'd5a9992273039671f2a7155597cf4150599df761':
  Add attributes and flags for DocCentric.
2014-05-07 16:05:49 +00:00
Craig Mautner
77f5a0f517 Merge "Add attributes and flags for DocCentric." 2014-05-07 16:00:03 +00:00
Craig Mautner
2dac056179 Add attributes and flags for DocCentric.
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: I04acc9333c3725b4db94a954358eb78df507ff53
2014-05-07 08:41:27 -07:00
Adam Connors
0c89304fe0 am e068ba87: Add enableSystemApp methods to DevicePolicyManager
* commit 'e068ba879ea9a712bf7ad6c91e55238f76f122d9':
  Add enableSystemApp methods to DevicePolicyManager
2014-05-07 15:25:19 +00:00
Adam Connors
010cfd4581 Add enableSystemApp methods to DevicePolicyManager
These methods allow profile or device owners to enable
systems apps pre-installed in the primary user in the
managed profile. Apps can be specified by either package
name or intent.

Bug: 13587051

Change-Id: Ifcbc68c139308506b6c18cf3c0ea62b8026ff75f
2014-05-07 16:20:38 +01:00
Jason Monk
96c99627c6 am f6118a19: Merge "Only show IME in navigation bar when it should"
* commit 'f6118a1968127912caad4aed6f2dfbd5177753ee':
  Only show IME in navigation bar when it should
2014-05-07 14:24:51 +00:00