OSDN Git Service

android-x86/frameworks-base.git
10 years agoFix build, also always draw accessibility focus rect
Alan Viverette [Thu, 1 May 2014 22:41:13 +0000 (15:41 -0700)]
Fix build, also always draw accessibility focus rect

BUG: 13873026
Change-Id: Ie8c0b9d6ef10968f64fb33a89e010b9b15e93f8b

10 years agoam 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
Brian Carlstrom [Thu, 1 May 2014 21:49:03 +0000 (21:49 +0000)]
am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '2de2e22540441fd02e03abae5bcae8feb873b929':
  Minor cleanup of UsageStatsService

10 years agoMerge "Load device default theme mapping from resources"
Alan Viverette [Thu, 1 May 2014 21:46:24 +0000 (21:46 +0000)]
Merge "Load device default theme mapping from resources"

10 years agoam e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
Brian Carlstrom [Thu, 1 May 2014 21:45:38 +0000 (21:45 +0000)]
am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c':
  Minor cleanup of UsageStatsService

10 years agoMerge "Deliver package broadcasts only to related profiles."
Amith Yamasani [Thu, 1 May 2014 21:44:08 +0000 (21:44 +0000)]
Merge "Deliver package broadcasts only to related profiles."

10 years agoLoad device default theme mapping from resources
Alan Viverette [Thu, 1 May 2014 21:42:56 +0000 (14:42 -0700)]
Load device default theme mapping from resources

Also adds a few missing styles and reorganizes some XML files. Makes
stackViewStyle public since it's defined in DeviceDefault.

Change-Id: I8f6a0f93410948b38619594474d60dc40ece5917

10 years agoam 0f7c0570: Merge "Minor cleanup of UsageStatsService"
Brian Carlstrom [Thu, 1 May 2014 21:41:58 +0000 (21:41 +0000)]
am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService

10 years agoDeliver package broadcasts only to related profiles.
Amith Yamasani [Thu, 1 May 2014 21:39:35 +0000 (14:39 -0700)]
Deliver package broadcasts only to related profiles.

Store the listener's userhandle in a cookie and compare profile
relationships before delivering package broadcasts to a listener.

Basically, don't leave TODOs around, they'll result in bugs :)

Bug: 14436558
Change-Id: I57a21719caab6cf54b78de7be2eca3e398dc6288

10 years agoMerge "Minor cleanup of UsageStatsService"
Brian Carlstrom [Thu, 1 May 2014 21:38:34 +0000 (21:38 +0000)]
Merge "Minor cleanup of UsageStatsService"

10 years agoMerge "Cleaning up TouchFeedbackDrawable and Ripple APIs"
Alan Viverette [Thu, 1 May 2014 21:26:07 +0000 (21:26 +0000)]
Merge "Cleaning up TouchFeedbackDrawable and Ripple APIs"

10 years agoMerge "Opimized the number of calls to updateChildren."
Selim Cinek [Thu, 1 May 2014 21:24:07 +0000 (21:24 +0000)]
Merge "Opimized the number of calls to updateChildren."

10 years agoCleaning up TouchFeedbackDrawable and Ripple APIs
Alan Viverette [Thu, 1 May 2014 21:22:33 +0000 (14:22 -0700)]
Cleaning up TouchFeedbackDrawable and Ripple APIs

Change-Id: I73ce0507ce98140c01fe77cc277b0fea75350be9

10 years agoMerge "Improve Gamepad fallbacks for text entry."
Michael Wright [Thu, 1 May 2014 21:15:44 +0000 (21:15 +0000)]
Merge "Improve Gamepad fallbacks for text entry."

10 years agoMerge "Add unhandledInputEvent API to ViewRoot"
Michael Wright [Thu, 1 May 2014 21:15:29 +0000 (21:15 +0000)]
Merge "Add unhandledInputEvent API to ViewRoot"

10 years agoMinor cleanup of UsageStatsService
Brian Carlstrom [Mon, 10 Mar 2014 20:39:25 +0000 (13:39 -0700)]
Minor cleanup of UsageStatsService

Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3

10 years agoOpimized the number of calls to updateChildren.
Selim Cinek [Thu, 1 May 2014 21:01:58 +0000 (23:01 +0200)]
Opimized the number of calls to updateChildren.

Improved the performance by batching multiple calls to updateChildren
to a single call on preDraw.

Change-Id: I386edeb15ac35201d39afcac8beaa48b09245448

10 years agoFixed a bug when a notification was quickly added and removed.
Selim Cinek [Thu, 1 May 2014 19:55:31 +0000 (21:55 +0200)]
Fixed a bug when a notification was quickly added and removed.

Change-Id: Id9b1cb771a2b6d1f42b61ef40a637e15c8d8f3b7

10 years agoam ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
Mindy Pereira [Thu, 1 May 2014 20:43:52 +0000 (20:43 +0000)]
am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev

* commit 'ed7e36dc2ef400916356459f9ea67d66645a85fb':
  Update fling min velocity

10 years agoam d5e92318: Merge "Update fling min velocity" into klp-modular-dev
Mindy Pereira [Thu, 1 May 2014 20:40:08 +0000 (20:40 +0000)]
am d5e92318: Merge "Update fling min velocity" into klp-modular-dev

* commit 'd5e92318b69d8af6d91dc3b51738913595e0f536':
  Update fling min velocity

10 years agoMerge "Remove unused AndroidProxySelectorRoutePlanner"
Jason Monk [Thu, 1 May 2014 20:37:22 +0000 (20:37 +0000)]
Merge "Remove unused AndroidProxySelectorRoutePlanner"

10 years agoMerge "Update fling min velocity" into klp-modular-dev
Mindy Pereira [Thu, 1 May 2014 20:34:35 +0000 (20:34 +0000)]
Merge "Update fling min velocity" into klp-modular-dev

10 years agoRemove unused AndroidProxySelectorRoutePlanner
Jason Monk [Thu, 1 May 2014 20:34:30 +0000 (16:34 -0400)]
Remove unused AndroidProxySelectorRoutePlanner

Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903

10 years agoAdd support for hiding action bars on scroll.
Adam Powell [Thu, 1 May 2014 17:23:33 +0000 (10:23 -0700)]
Add support for hiding action bars on scroll.

Also tweak the nested scrolling API around nested flings and fix a bug
where recursive nested scrolling would stop prematurely.

Change-Id: I561226db878b2493970440a6af3e2332c56a1913

10 years agoMerge "Fixed a bug where the notification scroller could crash."
Selim Cinek [Thu, 1 May 2014 19:31:08 +0000 (19:31 +0000)]
Merge "Fixed a bug where the notification scroller could crash."

10 years agoFixed a bug where the notification scroller could crash.
Selim Cinek [Thu, 1 May 2014 19:23:59 +0000 (21:23 +0200)]
Fixed a bug where the notification scroller could crash.

Due to a race condition the scroller could crash in certain cases
after an animation.

Bug: 14458203
Change-Id: Idc52109550270924bae5857e581574c63452f159

10 years agoMerge "Implement long-term condition subscriptions."
John Spurlock [Thu, 1 May 2014 19:17:53 +0000 (19:17 +0000)]
Merge "Implement long-term condition subscriptions."

10 years agoImplement long-term condition subscriptions.
John Spurlock [Thu, 1 May 2014 13:08:48 +0000 (09:08 -0400)]
Implement long-term condition subscriptions.

Bind long-term conditions (like "in a meeting") to enter/exit
zen mode automatically.

Persist automatic condition subscriptions to maintain them across
reboots.

Normalize condition state binding: true => enter zen, false => exit.

Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165

10 years agoAddress comments/fix javadoc in TaskManager API
Matthew Williams [Thu, 1 May 2014 17:55:28 +0000 (10:55 -0700)]
Address comments/fix javadoc in TaskManager API

Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911

10 years agoMerge "Fix build"
RoboErik [Thu, 1 May 2014 18:19:31 +0000 (18:19 +0000)]
Merge "Fix build"

10 years agoFix build
RoboErik [Thu, 1 May 2014 18:16:19 +0000 (11:16 -0700)]
Fix build

A CL missed running update-api after making a change before submitting.
https://googleplex-android.googlesource.com/platform/frameworks/base/+/6e31c5c82bc5c9bddf9c01d254067ea5bebbd96b

Change-Id: I62b33f07a98ecd546d8128c1eeb4c01bd338f202

10 years agoam 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
Wink Saville [Thu, 1 May 2014 18:03:57 +0000 (18:03 +0000)]
am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '437994578272f9770748b152c53ec655059d19ec':
  Add support for NETWORK_TYPE_GSM

10 years agoam 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
Wink Saville [Thu, 1 May 2014 18:00:50 +0000 (18:00 +0000)]
am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '74ec580873bb56cb5045a25efdb1eb7e2bac384c':
  Add support for NETWORK_TYPE_GSM

10 years agoam 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
Wink Saville [Thu, 1 May 2014 17:57:51 +0000 (17:57 +0000)]
am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM

10 years agoam 0c88867c: am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack...
Robert Ly [Thu, 1 May 2014 17:56:45 +0000 (17:56 +0000)]
am 0c88867c: am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs

* commit '0c88867c7c626c805e9f466bf9010d2a3115eb42':
  Revert "update wear stack notifications to coincide with devbyte code"

10 years agoam edbabd28: am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:56:40 +0000 (17:56 +0000)]
am edbabd28: am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name"

* commit 'edbabd2806a9c5c717eff24c65a718f4d2ece817':
  Revert "docs: fix method name"

10 years agoMerge "Add support for NETWORK_TYPE_GSM"
Wink Saville [Thu, 1 May 2014 17:53:54 +0000 (17:53 +0000)]
Merge "Add support for NETWORK_TYPE_GSM"

10 years agoAdd support for NETWORK_TYPE_GSM
Sandeep Kunta [Sat, 10 Aug 2013 15:25:38 +0000 (20:55 +0530)]
Add support for NETWORK_TYPE_GSM

Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf

10 years agoam 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications...
Robert Ly [Thu, 1 May 2014 17:51:23 +0000 (17:51 +0000)]
am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs

* commit '0135261361e21f3585b21ff4498b05bd6d1bf88d':
  Revert "update wear stack notifications to coincide with devbyte code"

10 years agoam e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:51:20 +0000 (17:51 +0000)]
am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name"

* commit 'e3135059dee534c9d93cfb0c6e4fa7574eff1049':
  Revert "docs: fix method name"

10 years agoam a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide...
Robert Ly [Thu, 1 May 2014 17:47:23 +0000 (17:47 +0000)]
am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs

* commit 'a9dfeaa94083c322fb95d8bd2ac765521ae8bceb':
  Revert "update wear stack notifications to coincide with devbyte code"

10 years agoam 9f129366: am 80b2cbbe: Revert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:47:19 +0000 (17:47 +0000)]
am 9f129366: am 80b2cbbe: Revert "docs: fix method name"

* commit '9f129366e6963aacb00893e0be1892003bc0b39d':
  Revert "docs: fix method name"

10 years agoMerge "TaskManager API first pass."
Matthew Williams [Thu, 1 May 2014 17:45:33 +0000 (17:45 +0000)]
Merge "TaskManager API first pass."

10 years agoam 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte...
Robert Ly [Thu, 1 May 2014 17:44:16 +0000 (17:44 +0000)]
am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs

* commit '7fadcf84244172004568c4107083d415f1285b75':
  Revert "update wear stack notifications to coincide with devbyte code"

10 years agoam 80b2cbbe: Revert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:44:13 +0000 (17:44 +0000)]
am 80b2cbbe: Revert "docs: fix method name"

* commit '80b2cbbe6c134ff415072f29eaa7392c1ebb0c52':
  Revert "docs: fix method name"

10 years agoMerge "Revert "update wear stack notifications to coincide with devbyte code"" into...
Robert Ly [Thu, 1 May 2014 17:41:39 +0000 (17:41 +0000)]
Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs

10 years agoRevert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:40:33 +0000 (17:40 +0000)]
Revert "docs: fix method name"

This reverts commit b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed.

Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518

10 years agoRevert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 17:40:16 +0000 (17:40 +0000)]
Revert "update wear stack notifications to coincide with devbyte code"

This reverts commit b8e3f209af70a7707be75d866b142dc1fccc8d5f.

Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766

10 years agoam 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping...
Mark Renouf [Thu, 1 May 2014 17:36:04 +0000 (17:36 +0000)]
am 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev

* commit '5b72a6abf85b26e66589db478cc105e7bfec6116':
  SwipeDismiss: limit fade to 50% alpha while swiping

10 years agoam 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp...
Mark Renouf [Thu, 1 May 2014 17:32:10 +0000 (17:32 +0000)]
am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev

* commit '41615284dfb00595ed642c4e31da6a035ff53224':
  SwipeDismiss: limit fade to 50% alpha while swiping

10 years agoMerge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
Mark Renouf [Thu, 1 May 2014 17:26:45 +0000 (17:26 +0000)]
Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev

10 years agoMerge "Add Session API calls to RCC and AudioManager"
RoboErik [Thu, 1 May 2014 17:14:56 +0000 (17:14 +0000)]
Merge "Add Session API calls to RCC and AudioManager"

10 years agoAdd Session API calls to RCC and AudioManager
RoboErik [Wed, 23 Apr 2014 21:38:17 +0000 (14:38 -0700)]
Add Session API calls to RCC and AudioManager

This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4

10 years agoMerge "Add dump to MediaSessionService"
RoboErik [Thu, 1 May 2014 17:11:34 +0000 (17:11 +0000)]
Merge "Add dump to MediaSessionService"

10 years agoam 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 1 May 2014 16:25:29 +0000 (16:25 +0000)]
am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '1ffec559d04618fbd31eaf972a81c6df324965c1':
  Import translations. DO NOT MERGE

10 years agoam bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 1 May 2014 16:21:50 +0000 (16:21 +0000)]
am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 1 May 2014 16:18:20 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 May 2014 16:18:17 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 May 2014 16:18:12 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 May 2014 16:18:06 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam f8df90fd: am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name
Robert Ly [Thu, 1 May 2014 16:06:05 +0000 (16:06 +0000)]
am f8df90fd: am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name

* commit 'f8df90fd6a4afffd9ff51a91df55e3a6fd62f67c':
  docs: fix method name

10 years agoam 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name
Robert Ly [Thu, 1 May 2014 16:02:16 +0000 (16:02 +0000)]
am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name

* commit '007fad0dbd3f8bd3a8b7323a4587eab954093f27':
  docs: fix method name

10 years agoMerge "Fixed several bugs regarding the state of the notifications"
Selim Cinek [Thu, 1 May 2014 16:01:50 +0000 (16:01 +0000)]
Merge "Fixed several bugs regarding the state of the notifications"

10 years agoam 6b7f3936: am b39ce1b6: docs: fix method name
Robert Ly [Thu, 1 May 2014 15:56:58 +0000 (15:56 +0000)]
am 6b7f3936: am b39ce1b6: docs: fix method name

* commit '6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
  docs: fix method name

10 years agoam b39ce1b6: docs: fix method name
Robert Ly [Thu, 1 May 2014 15:53:03 +0000 (15:53 +0000)]
am b39ce1b6: docs: fix method name

* commit 'b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
  docs: fix method name

10 years agodocs: fix method name
Robert Ly [Thu, 1 May 2014 15:47:14 +0000 (08:47 -0700)]
docs: fix method name

Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc

10 years agoMerge "Revert "Temporarily switch off returning only enabled profiles to support...
Alexandra Gherghina [Thu, 1 May 2014 15:42:07 +0000 (15:42 +0000)]
Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding""

10 years agoFixed several bugs regarding the state of the notifications
Selim Cinek [Thu, 1 May 2014 13:51:58 +0000 (15:51 +0200)]
Fixed several bugs regarding the state of the notifications

Fixed an issue where the last card was hidden even though there would
have been enough space to show it when it was expanded.
Also fixed an issue where the first card was not expandable when it was
the only one.
In addition the scroll range was corrected, to ensure that the last card
could always be scrolled to full visibility, which was not the case
previously when the last card was expanded.

Bug: 14376035
Change-Id: I372a55dc1fc6e381dd9aef3d631447912e3d1024

10 years agoam 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer...
Marco Nelissen [Thu, 1 May 2014 15:35:31 +0000 (15:35 +0000)]
am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.

10 years agoam ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombs...
Marco Nelissen [Thu, 1 May 2014 15:32:17 +0000 (15:32 +0000)]
am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.

10 years agoam ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
Marco Nelissen [Thu, 1 May 2014 15:28:14 +0000 (15:28 +0000)]
am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.

10 years agoMerge "MetadataRetriever: Check null pointer to avoid tombstone crash."
Marco Nelissen [Thu, 1 May 2014 15:25:13 +0000 (15:25 +0000)]
Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

10 years agoam 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting...
Narayan Kamath [Thu, 1 May 2014 14:51:04 +0000 (14:51 +0000)]
am 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."

* commit '531381056fac077cffcd509b1e89d9b41f400fca':
  Don't adjust ABI if PackageSetting#pkg is null.

10 years agoam d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."
Narayan Kamath [Thu, 1 May 2014 14:51:00 +0000 (14:51 +0000)]
am d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."

* commit 'd6809b35aff02fdccf7ac433005aba2d06bbc3ff':
  Fix dex file pruning logic.

10 years agoam fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for...
Narayan Kamath [Thu, 1 May 2014 14:50:57 +0000 (14:50 +0000)]
am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit 'fbd80b58db2aa8f650acf26305e8cbed24a5755b':
  Adjust instruction sets for shared UID apps.

10 years agoam 3a951e52: (-s ours) resolved conflicts for merge of 69da8a12 to klp-modular-dev...
Narayan Kamath [Thu, 1 May 2014 14:44:38 +0000 (14:44 +0000)]
am 3a951e52: (-s ours) resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

* commit '3a951e52d93697b7e232501b78f9ffb0ec605516':
  Package manager changes for dual zygote stack.

10 years agoMerge "Fixed transition start delay propagation when duration = 0."
George Mount [Thu, 1 May 2014 14:44:02 +0000 (14:44 +0000)]
Merge "Fixed transition start delay propagation when duration = 0."

10 years agoam 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
Narayan Kamath [Thu, 1 May 2014 14:39:20 +0000 (14:39 +0000)]
am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."

* commit '5dca099df7100c531e111b50435605c318f1e6d4':
  Don't adjust ABI if PackageSetting#pkg is null.

10 years agoam c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."
Narayan Kamath [Thu, 1 May 2014 14:39:16 +0000 (14:39 +0000)]
am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."

* commit 'c1f81f9086037dde6e082b8a80c84277cb727726':
  Fix dex file pruning logic.

10 years agoam 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
Narayan Kamath [Thu, 1 May 2014 14:39:12 +0000 (14:39 +0000)]
am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc':
  Adjust instruction sets for shared UID apps.

10 years agoFix build.
Narayan Kamath [Thu, 1 May 2014 14:37:15 +0000 (15:37 +0100)]
Fix build.

Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16

10 years agoresolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
Narayan Kamath [Thu, 1 May 2014 14:32:20 +0000 (15:32 +0100)]
resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

10 years agoam d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."
Narayan Kamath [Thu, 1 May 2014 14:31:12 +0000 (14:31 +0000)]
am d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."

* commit 'd2ec8724d2a3407e28161299d44e2e113fe437ec':
  Fix OEM native library path bug.

10 years agoam f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"
Narayan Kamath [Thu, 1 May 2014 14:31:07 +0000 (14:31 +0000)]
am f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit 'f5c6a1b3eb10f0374fcbab55853f400778f0f8e7':
  Fix native-lib dir assignment & updating

10 years agoam 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as...
Narayan Kamath [Thu, 1 May 2014 14:31:02 +0000 (14:31 +0000)]
am 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"

* commit '0338af46f968e2e1c2fd8c62e9387546fa9ed86b':
  Handle /oem and /vendor as well

10 years agoMerge "Fix "blink" when going "back" quickly after entering Activity."
George Mount [Thu, 1 May 2014 14:13:00 +0000 (14:13 +0000)]
Merge "Fix "blink" when going "back" quickly after entering Activity."

10 years agoFixed transition start delay propagation when duration = 0.
George Mount [Wed, 30 Apr 2014 23:24:53 +0000 (16:24 -0700)]
Fixed transition start delay propagation when duration = 0.

Bug 14443184

Also gave the propagation speed a tweak to make it more
obvious that there is a propagation.

Change-Id: If9dc3172ae6ce7e6a712ccd1b83ebec9bf880bfa

10 years agoam 5bc12a1b: (-s ours) am a7b465ef: am d91358b2: Merge "Support per-package lib dirs...
Narayan Kamath [Thu, 1 May 2014 14:06:37 +0000 (14:06 +0000)]
am 5bc12a1b: (-s ours) am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"

* commit '5bc12a1b5dadfd504fb03875fad97cda8d39cf25':
  Support per-package lib dirs for bundled apps

10 years agoam d85ded89: am 645a920f: Merge "Fix OEM native library path bug."
Narayan Kamath [Thu, 1 May 2014 14:01:14 +0000 (14:01 +0000)]
am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."

* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
  Fix OEM native library path bug.

10 years agoam eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"
Narayan Kamath [Thu, 1 May 2014 14:01:10 +0000 (14:01 +0000)]
am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit 'eb5734989b3ef5455359f8807684a860ad04c134':
  Fix native-lib dir assignment & updating

10 years agoam 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
Narayan Kamath [Thu, 1 May 2014 14:00:52 +0000 (14:00 +0000)]
am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."

* commit '1cec7f8539e6465ff80577169d7d07df3c2574b7':
  Don't adjust ABI if PackageSetting#pkg is null.

10 years agoam 27f2bfc4: Merge "Fix dex file pruning logic."
Narayan Kamath [Thu, 1 May 2014 14:00:49 +0000 (14:00 +0000)]
am 27f2bfc4: Merge "Fix dex file pruning logic."

* commit '27f2bfc406157039c5241f6a4f38f597b2076e2a':
  Fix dex file pruning logic.

10 years agoam bcc3b312: Merge "Adjust instruction sets for shared UID apps."
Narayan Kamath [Thu, 1 May 2014 14:00:46 +0000 (14:00 +0000)]
am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
  Adjust instruction sets for shared UID apps.

10 years agoam 2a9a0471: Merge "Package manager changes for dual zygote stack."
Narayan Kamath [Thu, 1 May 2014 14:00:43 +0000 (14:00 +0000)]
am 2a9a0471: Merge "Package manager changes for dual zygote stack."

* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.

10 years agoam 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
Narayan Kamath [Thu, 1 May 2014 14:00:25 +0000 (14:00 +0000)]
am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."

* commit '6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
  Implement FileUtils#contains.

10 years agoam 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
Narayan Kamath [Thu, 1 May 2014 13:57:21 +0000 (13:57 +0000)]
am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"

* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
  Handle /oem and /vendor as well

10 years agoam a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"
Narayan Kamath [Thu, 1 May 2014 13:57:17 +0000 (13:57 +0000)]
am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"

* commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de':
  Support per-package lib dirs for bundled apps

10 years agoam 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
Narayan Kamath [Thu, 1 May 2014 13:57:13 +0000 (13:57 +0000)]
am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."

* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.

10 years agoMerge "Don't adjust ABI if PackageSetting#pkg is null."
Narayan Kamath [Thu, 1 May 2014 13:56:58 +0000 (13:56 +0000)]
Merge "Don't adjust ABI if PackageSetting#pkg is null."

10 years agoam 645a920f: Merge "Fix OEM native library path bug."
Narayan Kamath [Thu, 1 May 2014 13:56:59 +0000 (13:56 +0000)]
am 645a920f: Merge "Fix OEM native library path bug."

* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.

10 years agoam 986b901a: Merge "Fix native-lib dir assignment & updating"
Narayan Kamath [Thu, 1 May 2014 13:56:56 +0000 (13:56 +0000)]
am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit '986b901ae280928e91193527f7c883b296fc62fc':
  Fix native-lib dir assignment & updating