OSDN Git Service
Chien-Yu Chen [Fri, 22 May 2015 18:19:58 +0000 (18:19 +0000)]
am
f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev
* commit '
f5b1e39c2e47a09e5df7d1cfbf05abcca0d429c9':
Camera2: Implement toString() for camera2 params
Johan Euphrosine [Fri, 22 May 2015 18:19:52 +0000 (18:19 +0000)]
am
14e121bd: am
6e7d2ba8: am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
14e121bd8161f9ee8ee34c1f01b72c001359810d':
frameworks/base/docs: add jd files for NDK reference
Joe Fernandez [Fri, 22 May 2015 18:19:48 +0000 (18:19 +0000)]
am
45765ca6: am
eae90b80: am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
45765ca6f43ceede82a4a953d37c3511e1428d57':
docs: M Preview Program overview, update 2
Chien-Yu Chen [Fri, 22 May 2015 18:15:03 +0000 (18:15 +0000)]
Merge "Camera2: Implement toString() for camera2 params" into mnc-dev
Johan Euphrosine [Fri, 22 May 2015 18:10:45 +0000 (18:10 +0000)]
am
6e7d2ba8: am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
6e7d2ba8095c7c312013ff450dc8396135853e60':
frameworks/base/docs: add jd files for NDK reference
Joe Fernandez [Fri, 22 May 2015 18:10:40 +0000 (18:10 +0000)]
am
eae90b80: am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
eae90b806a4a99f3c815113434d7808114db8d07':
docs: M Preview Program overview, update 2
Chris Craik [Fri, 22 May 2015 18:07:14 +0000 (18:07 +0000)]
am
33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev
* commit '
33416a9363a8d78bf10818d40806085a4d1ba311':
Disable density scaling for HW canvas
Chris Craik [Fri, 22 May 2015 17:57:07 +0000 (17:57 +0000)]
Merge "Disable density scaling for HW canvas" into mnc-dev
Chris Craik [Thu, 21 May 2015 23:46:53 +0000 (16:46 -0700)]
Disable density scaling for HW canvas
bug:
20692121
Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990
Eric Laurent [Fri, 22 May 2015 17:47:10 +0000 (17:47 +0000)]
am
843f1e0f: Merge "sound trigger: fix wrong field type in JNI" into mnc-dev
* commit '
843f1e0f94dc1a6af209d16b3a22e100925f44fb':
sound trigger: fix wrong field type in JNI
Chien-Yu Chen [Wed, 20 May 2015 17:16:59 +0000 (10:16 -0700)]
Camera2: Implement toString() for camera2 params
Implement toString() for BlackLevelPattern, InputConfiguration, and
StreamConfigurationMap.
Bug:
16899576
Change-Id: Ide1cf103f3282750653ce7bdc29c0b74920d4855
Eric Laurent [Fri, 22 May 2015 17:36:39 +0000 (17:36 +0000)]
Merge "sound trigger: fix wrong field type in JNI" into mnc-dev
Eric Laurent [Fri, 22 May 2015 17:30:13 +0000 (10:30 -0700)]
sound trigger: fix wrong field type in JNI
Bug:
20951546.
Change-Id: I44f6dd05888e335a70bd212eb6f9c468a338ff92
Fyodor Kupolov [Fri, 22 May 2015 16:37:49 +0000 (16:37 +0000)]
am
96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev
* commit '
96616a57f3af05d4808fb5b84e758000f6ab5372':
Use factory methods for RestrictionEntry
Fyodor Kupolov [Fri, 22 May 2015 16:21:19 +0000 (16:21 +0000)]
Merge "Use factory methods for RestrictionEntry" into mnc-dev
Robert Shih [Fri, 22 May 2015 16:08:45 +0000 (16:08 +0000)]
am
67ba691a: Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev
* commit '
67ba691ad6fbc6d0ee28635b40c87f4cddd61399':
MediaPlayer: add mPreparing to weed out unwanted prepared messages
Jean-Michel Trivi [Fri, 22 May 2015 16:03:29 +0000 (16:03 +0000)]
am
b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
* commit '
b0eb08b521d2b76531df3946cece002ed72fa363':
Remove the 5 sec timeout logic for setVolumeControlStream
Robert Shih [Fri, 22 May 2015 16:02:05 +0000 (16:02 +0000)]
Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev
Jean-Michel Trivi [Fri, 22 May 2015 15:51:34 +0000 (15:51 +0000)]
Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
Jason Monk [Fri, 22 May 2015 15:39:13 +0000 (15:39 +0000)]
am
bf3d1af3: SettingsLib: Fix wifi crash during settings index
* commit '
bf3d1af3d8bd32f410aa5cc44ccdc1df593ef210':
SettingsLib: Fix wifi crash during settings index
Johan Euphrosine [Fri, 22 May 2015 15:37:49 +0000 (15:37 +0000)]
am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
fe6d855cf3239558f780f91ded6679f54cd47661':
frameworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)]
am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
16580c9bb4ef4cad1f5d59402a855189decb56ba':
frameworks/base/docs: add jd files for NDK reference
Jason Monk [Fri, 22 May 2015 15:25:04 +0000 (11:25 -0400)]
SettingsLib: Fix wifi crash during settings index
and test it
Bug:
21365029
Change-Id: I9a914773577dcbe591b41c9114ba4d078b5e7369
Johan Euphrosine [Fri, 22 May 2015 15:15:51 +0000 (15:15 +0000)]
am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
460bcb54d58b8eec86504d2b4518267a69d5eb16':
frameworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Fri, 22 May 2015 14:39:33 +0000 (14:39 +0000)]
Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
Clara Bayarri [Fri, 22 May 2015 10:33:55 +0000 (10:33 +0000)]
am
ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
* commit '
ae0940fe754b7aba552b4a5cd616df052606ccd1':
Update the PROCESS_TEXT action javadoc to include types
Clara Bayarri [Fri, 22 May 2015 10:24:55 +0000 (10:24 +0000)]
Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
Erik Kline [Fri, 22 May 2015 04:29:43 +0000 (04:29 +0000)]
am
2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev
* commit '
2dcba49caf114dd24ffc1c26a11683c5cb21e3ff':
Notify only on loss of provisioning.
Joe Fernandez [Fri, 22 May 2015 04:29:13 +0000 (04:29 +0000)]
am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
ee143ce3eca3db788ddff6f21a8aae6471eec5db':
docs: M Preview Program overview, update 2
Erik Kline [Fri, 22 May 2015 04:22:03 +0000 (04:22 +0000)]
Merge "Notify only on loss of provisioning." into mnc-dev
Joe Fernandez [Fri, 22 May 2015 04:08:41 +0000 (21:08 -0700)]
docs: M Preview Program overview, update 2
Change-Id: If36aa779a29b9ac0a5c36e7ecf4bfe80a25d5ba4
Erik Kline [Thu, 21 May 2015 07:17:12 +0000 (16:17 +0900)]
Notify only on loss of provisioning.
Lots of code refactoring, include:
- no longer watch for on-link proxies (only routers and DNS servers)
- keep track of NUD state of neighbors of interest
Bug:
18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397
Keisuke Kuroyanagi [Fri, 22 May 2015 02:41:20 +0000 (02:41 +0000)]
am
1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit '
1733bd3defde7818940d72dac95bb18fb8d70b22':
Fix: Insertion handle can be moved just by tapping.
Keisuke Kuroyanagi [Fri, 22 May 2015 02:28:23 +0000 (02:28 +0000)]
Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
Adam Lesinski [Fri, 22 May 2015 02:19:00 +0000 (02:19 +0000)]
am
35f6c005: Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev
* commit '
35f6c005be3565d49da60ff4e5b267a541115745':
BatteryStatsService: Only query bluetooth on demand.
Jim Miller [Fri, 22 May 2015 02:09:58 +0000 (02:09 +0000)]
am
b0eec328: Merge "Fix type-o in fingerprint string messages." into mnc-dev
* commit '
b0eec3288fc84fd5118be15004e46e27e5e584c1':
Fix type-o in fingerprint string messages.
Vinit Deshpande [Fri, 22 May 2015 02:09:51 +0000 (02:09 +0000)]
am
45261633: Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev
* commit '
4526163398e49713065d05be010d3233a281b05f':
Indicate failed scans with EXTRA_RESULTS_UPDATED
Griff Hazen [Fri, 22 May 2015 02:09:46 +0000 (02:09 +0000)]
am
cf3591ad: (-s ours) am
99fd373c: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
cf3591ad60fac149fbe4d3e7e6335fdb9ea63eef':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Fri, 22 May 2015 02:09:41 +0000 (02:09 +0000)]
am
c40cd40d: (-s ours) am
77420269: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
c40cd40d90c54b20e490fb25596f0781601e5d6d':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Dirk Dougherty [Fri, 22 May 2015 02:09:35 +0000 (02:09 +0000)]
am
f4ba7833: am
0140854a: am
85dea528: Doc change: updated images, landings, and ndk updates.
* commit '
f4ba7833af54ad6a75803dd678acac57c7f9e26b':
Doc change: updated images, landings, and ndk updates.
Luan Nguyen [Fri, 22 May 2015 02:09:29 +0000 (02:09 +0000)]
am
67fe970e: am
82120b61: am
5c7dcb30: am
0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '
67fe970eaaa81b8fb4313ced7a05aac41bf25400':
docs: Update the AlwaysOn sample link to point to DAC's samples
Joe Fernandez [Fri, 22 May 2015 02:09:24 +0000 (02:09 +0000)]
am
b7361058: am
18cc51d6: am
23fcc39e: docs: M Preview downloads and SDK Setup pages v2
* commit '
b73610589aa5b580d3e22cbe8816cc48063d30ab':
docs: M Preview downloads and SDK Setup pages v2
Luan Nguyen [Fri, 22 May 2015 02:09:19 +0000 (02:09 +0000)]
am
1c23c1cb: am
d8573aa5: am
dfa79aeb: am
d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit '
1c23c1cb40a2e9e54e8fe1b707e9f29f9b00ee54':
docs: Refresh Wearable support library reference for Diamond
Luan Nguyen [Fri, 22 May 2015 02:09:14 +0000 (02:09 +0000)]
am
63b426e0: am
f644f702: am
6d592518: am
8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '
63b426e0c3e559dd57adf64b09fcda899e79cfaa':
docs: Remove references to Android Studio 0.8 beta
Luan Nguyen [Fri, 22 May 2015 02:09:08 +0000 (02:09 +0000)]
am
ca734e13: am
6a4d4a46: am
2801c77e: am
606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '
ca734e13c0048fb97f19c4a23b00c5ecf5558b00':
docs: Add Always-On lesson for Wear apps
Luan Nguyen [Fri, 22 May 2015 02:09:03 +0000 (02:09 +0000)]
am
d37e23df: am
0444253e: am
94587871: am
5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '
d37e23df30a58626116f2031061d0ea70ce65010':
docs: Add always-on design for wearable activities
Filip Gruszczynski [Fri, 22 May 2015 02:08:59 +0000 (02:08 +0000)]
am
c32b981c: am
479b1c77: am
037c9cac: Merge "Fix build." into cw-d-mr1-dev
* commit '
c32b981c76807f00e62aeb2a1d748045c970458a':
Fix build.
Adam Lesinski [Fri, 22 May 2015 02:08:54 +0000 (02:08 +0000)]
Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev
Adam Lesinski [Thu, 21 May 2015 22:04:18 +0000 (15:04 -0700)]
BatteryStatsService: Only query bluetooth on demand.
Bluetooth was being queried too often, leading to more power
consumption and wakelock time.
Bug:
21063567
Bug:
21269307
Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266
Jim Miller [Fri, 22 May 2015 02:00:20 +0000 (02:00 +0000)]
Merge "Fix type-o in fingerprint string messages." into mnc-dev
Jim Miller [Fri, 22 May 2015 01:59:10 +0000 (18:59 -0700)]
Fix type-o in fingerprint string messages.
Fixes bug
19561423
Change-Id: I1f7d88884d551b6b1250455cf3ff9496adf34263
Vinit Deshpande [Fri, 22 May 2015 01:58:36 +0000 (01:58 +0000)]
Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev
Filip Gruszczynski [Fri, 22 May 2015 01:54:56 +0000 (01:54 +0000)]
Jim Miller [Fri, 22 May 2015 01:54:49 +0000 (01:54 +0000)]
am
361b2d69: Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev
* commit '
361b2d69eef8cb19994a17fb317b7b84ea5b0b95':
Fix crash in fingerprint and problem where directory has wrong selinux label
Griff Hazen [Fri, 22 May 2015 01:50:57 +0000 (01:50 +0000)]
am
99fd373c: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
99fd373cc66e0b4512b6b32c08c453501482a76e':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Fri, 22 May 2015 01:50:45 +0000 (01:50 +0000)]
am
77420269: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
77420269fe36e693efd8e78d047a90c7d4fbb66b':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Dirk Dougherty [Fri, 22 May 2015 01:50:32 +0000 (01:50 +0000)]
am
0140854a: am
85dea528: Doc change: updated images, landings, and ndk updates.
* commit '
0140854a636ed7def204d769dbc4eb7857d009be':
Doc change: updated images, landings, and ndk updates.
Luan Nguyen [Fri, 22 May 2015 01:49:51 +0000 (01:49 +0000)]
am
82120b61: am
5c7dcb30: am
0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '
82120b618045186f99c0c939934d1ecfc82c9caa':
docs: Update the AlwaysOn sample link to point to DAC's samples
Joe Fernandez [Fri, 22 May 2015 01:49:43 +0000 (01:49 +0000)]
am
18cc51d6: am
23fcc39e: docs: M Preview downloads and SDK Setup pages v2
* commit '
18cc51d6df88f59a442bf2194efd74e1f2e07347':
docs: M Preview downloads and SDK Setup pages v2
Luan Nguyen [Fri, 22 May 2015 01:49:37 +0000 (01:49 +0000)]
am
d8573aa5: am
dfa79aeb: am
d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit '
d8573aa517922431dc1f50575c692b2bc1cb0307':
docs: Refresh Wearable support library reference for Diamond
Luan Nguyen [Fri, 22 May 2015 01:49:31 +0000 (01:49 +0000)]
am
f644f702: am
6d592518: am
8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '
f644f70208871d54729c74f74727e6083b27f569':
docs: Remove references to Android Studio 0.8 beta
Luan Nguyen [Fri, 22 May 2015 01:49:25 +0000 (01:49 +0000)]
am
6a4d4a46: am
2801c77e: am
606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '
6a4d4a46f24389f83c1d1a837d01c76a9effd6e6':
docs: Add Always-On lesson for Wear apps
Luan Nguyen [Fri, 22 May 2015 01:49:19 +0000 (01:49 +0000)]
am
0444253e: am
94587871: am
5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '
0444253e6911af35db350cc6678dc2b2d020c68c':
docs: Add always-on design for wearable activities
Filip Gruszczynski [Fri, 22 May 2015 01:49:03 +0000 (01:49 +0000)]
am
479b1c77: am
037c9cac: Merge "Fix build." into cw-d-mr1-dev
* commit '
479b1c77ce7b033f7160614f5a0d7305d1268129':
Fix build.
Filip Gruszczynski [Thu, 21 May 2015 02:40:27 +0000 (19:40 -0700)]
Fix build.
Cherry picking because automerger is stuck.
Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
(cherry picked from commit
c1b736a0cdf41ab5863bfe6901e46c95cc396342)
Jim Miller [Fri, 22 May 2015 01:42:23 +0000 (01:42 +0000)]
Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev
Dianne Hackborn [Fri, 22 May 2015 01:24:58 +0000 (01:24 +0000)]
am
8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit '
8b20cdb27bc5b4c433c4fc650203be9a25842bbd':
Add API to track usage time of apps.
Jean-Michel Trivi [Fri, 22 May 2015 01:23:57 +0000 (18:23 -0700)]
Remove the 5 sec timeout logic for setVolumeControlStream
Bug
16983918
Change-Id: I65174615d882ea433105862b1ecc50c512979ef9
Dianne Hackborn [Fri, 22 May 2015 01:12:43 +0000 (01:12 +0000)]
Merge "Add API to track usage time of apps." into mnc-dev
Selim Gurun [Fri, 22 May 2015 01:11:58 +0000 (01:11 +0000)]
am
95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '
95821eeabc1d6ae07ed2c3e6763f17473fb32ae3':
Clean remaining API related issues.
Selim Gurun [Fri, 22 May 2015 01:02:12 +0000 (01:02 +0000)]
Merge "Clean remaining API related issues." into mnc-dev
Etan Cohen [Fri, 22 May 2015 01:01:05 +0000 (18:01 -0700)]
Merge commit '
e391b13' into merge
Etan Cohen [Fri, 22 May 2015 00:59:49 +0000 (17:59 -0700)]
Merge commit '
93bbf27' into merge
Etan Cohen [Fri, 22 May 2015 00:59:07 +0000 (17:59 -0700)]
Merge commit '
113bd7d' into merge
Etan Cohen [Fri, 22 May 2015 00:58:25 +0000 (17:58 -0700)]
Merge commit '
35105ee7' into merge
Selim Gurun [Fri, 22 May 2015 00:24:08 +0000 (17:24 -0700)]
Clean remaining API related issues.
Bug:
21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
Jim Miller [Fri, 22 May 2015 00:02:21 +0000 (17:02 -0700)]
Fix crash in fingerprint and problem where directory has wrong selinux label
Fixes bug
21373942
Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7
Adrian Roos [Fri, 22 May 2015 00:24:54 +0000 (00:24 +0000)]
am
5347d018: Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev
* commit '
5347d0185ba4e5401e50d9268c68a152c0f05757':
Prevent ImmersiveModeCling from eating all touches
Filip Gruszczynski [Fri, 22 May 2015 00:24:49 +0000 (00:24 +0000)]
am
91e5b0f5: Merge "resolved conflicts for merge of
47249f2a to mnc-dev" into mnc-dev
* commit '
91e5b0f598f19499e55dcb8f0243b430e3c1ee4f':
Support for devices with a chin.
Deepanshu Gupta [Fri, 22 May 2015 00:24:44 +0000 (00:24 +0000)]
am
e4b47614: Merge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev
* commit '
e4b47614b7f07dedabe316b5263ec37249ce9c15':
Add LayoutLibDelegate for new Bitmap method.
Craig Mautner [Fri, 22 May 2015 00:24:28 +0000 (00:24 +0000)]
am
15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '
15dddf38912507e54b29e90cd0e8b0cd1335ebd6':
For getHomeActivity() only return current user.
Selim Cinek [Fri, 22 May 2015 00:24:22 +0000 (00:24 +0000)]
am
79d79c45: The heads up now have a margin on top and don\'t stick to the edge
* commit '
79d79c455beecf7a70460575ab21d9bf49767e2c':
The heads up now have a margin on top and don't stick to the edge
Selim Cinek [Fri, 22 May 2015 00:24:07 +0000 (00:24 +0000)]
am
ffa6eb87: Fixed a crash with HUN notifications
* commit '
ffa6eb8791b65d3959682ee187124c1a06d28884':
Fixed a crash with HUN notifications
Adrian Roos [Fri, 22 May 2015 00:09:11 +0000 (00:09 +0000)]
Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev
Filip Gruszczynski [Fri, 22 May 2015 00:02:47 +0000 (00:02 +0000)]
Merge "resolved conflicts for merge of
47249f2a to mnc-dev" into mnc-dev
Deepanshu Gupta [Fri, 22 May 2015 00:01:45 +0000 (00:01 +0000)]
Merge "Add LayoutLibDelegate for new Bitmap method." into mnc-dev
Dianne Hackborn [Thu, 21 May 2015 01:18:46 +0000 (18:18 -0700)]
Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.
The time interval tracked is from when the app launches the
activity until the user leaves that app's flow. They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries. For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.
The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow. For example, use the notification shade, launcher, or
recents to launch or switch to another app. Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.
The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.
Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
Robert Shih [Thu, 21 May 2015 22:15:50 +0000 (15:15 -0700)]
MediaPlayer: add mPreparing to weed out unwanted prepared messages
Bug:
21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
Craig Mautner [Thu, 21 May 2015 23:40:26 +0000 (23:40 +0000)]
Merge "For getHomeActivity() only return current user." into mnc-dev
Selim Cinek [Thu, 21 May 2015 23:14:45 +0000 (16:14 -0700)]
The heads up now have a margin on top and don't stick to the edge
Bug:
21337754
Change-Id: I199bc0732df62eadc2458db12a7c1059da988020
Selim Cinek [Thu, 21 May 2015 19:11:12 +0000 (12:11 -0700)]
Fixed a crash with HUN notifications
Bug:
20925733
Change-Id: Id96c9e476d9faa770b5bcd3c35213dd0debdeaea
Deepanshu Gupta [Thu, 21 May 2015 23:03:24 +0000 (16:03 -0700)]
Add LayoutLibDelegate for new Bitmap method.
Original method added in:
721ae5fec5f1fd4f93aa2a361a0ac298e15ce353
Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34
Griff Hazen [Thu, 21 May 2015 22:55:23 +0000 (22:55 +0000)]
am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:55:18 +0000 (22:55 +0000)]
am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
5825ad231319207a64debacaa3db4812548b0442':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:43:45 +0000 (22:43 +0000)]
Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Craig Mautner [Thu, 21 May 2015 22:33:30 +0000 (15:33 -0700)]
For getHomeActivity() only return current user.
Previously getHomeActivity() returned the topmost home activity
independent of which user was currently running. That defeated the
purpose of the method. This fix returns the home activity of the
current user or null if one has not yet been created.
Also remove some cruft that accumulated.
Fixes bug
21055376.
Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
Nancy Chen [Thu, 21 May 2015 22:14:36 +0000 (22:14 +0000)]
am
769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit '
769832d11163abaa8a355650e796c2e39d7e0f3d':
Fix phone account component name for voicemail status entries.
Dirk Dougherty [Thu, 21 May 2015 22:13:19 +0000 (22:13 +0000)]
am
85dea528: Doc change: updated images, landings, and ndk updates.
* commit '
85dea528866217d4b3d40a1162c00c4e836504aa':
Doc change: updated images, landings, and ndk updates.
Fyodor Kupolov [Thu, 21 May 2015 22:06:44 +0000 (15:06 -0700)]
Use factory methods for RestrictionEntry
As per API council request, factory methods should be used instead of using
boolean.
Bug:
21343772
Change-Id: Ia0889e46916f4ed7edb942217880cdf9c27771c2
Nancy Chen [Thu, 21 May 2015 22:01:33 +0000 (22:01 +0000)]
Merge "Fix phone account component name for voicemail status entries." into mnc-dev