Commit Graph

50605 Commits

Author SHA1 Message Date
Eric Laurent
fb641c79a2 am 2cb2f92c: Merge "fix AudioTrack and AudioRecord JNI"
* commit '2cb2f92c941bce3fb91c02f05df39e5b3c462d21':
  fix AudioTrack and AudioRecord JNI
2014-05-01 23:52:43 +00:00
Eric Laurent
27e12e7292 Merge "fix AudioTrack and AudioRecord JNI" 2014-05-01 23:49:51 +00:00
Alan Viverette
fb403b73b8 am fa1a3b14: Merge "Fix build, also always draw accessibility focus rect"
* commit 'fa1a3b14f6d626e8ad6bef41a6ab4bcb01034ba4':
  Fix build, also always draw accessibility focus rect
2014-05-01 22:58:01 +00:00
Vinod Krishnan
b0b9645dbd am 1ae785c1: am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '1ae785c1db63b6c257db89acca0ba1a083c1e7bd':
  DialogAlert window changes for Micro
2014-05-01 22:54:04 +00:00
Alan Viverette
85a3c8a5b7 Merge "Fix build, also always draw accessibility focus rect" 2014-05-01 22:52:28 +00:00
Vinod Krishnan
2c3e7a3486 am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '8e95d9883666e2b4b1ce26b312d09ba42ae37f7a':
  DialogAlert window changes for Micro
2014-05-01 22:49:29 +00:00
Vinod Krishnan
8e95d98836 am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
  DialogAlert window changes for Micro
2014-05-01 22:46:16 +00:00
Vinod Krishnan
5c10c3cfa6 Merge "DialogAlert window changes for Micro" into klp-modular-dev 2014-05-01 22:43:58 +00:00
Alan Viverette
0a7e8f9997 Fix build, also always draw accessibility focus rect
BUG: 13873026
Change-Id: Ie8c0b9d6ef10968f64fb33a89e010b9b15e93f8b
2014-05-01 15:41:13 -07:00
Alan Viverette
8895ece8c3 am aadda965: Merge "Load device default theme mapping from resources"
* commit 'aadda9656ad084f277dc5e6c5332667c8f995246':
  Load device default theme mapping from resources
2014-05-01 21:49:12 +00:00
Alan Viverette
2f3c8d070a Merge "Load device default theme mapping from resources" 2014-05-01 21:46:24 +00:00
Alan Viverette
0810b63739 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
2014-05-01 14:42:56 -07:00
Michael Wright
31a5f6fbbc am 576eedef: Merge "Add unhandledInputEvent API to ViewRoot"
* commit '576eedefe910d45d46da2f37457e415fdd0479dc':
  Add unhandledInputEvent API to ViewRoot
2014-05-01 21:19:20 +00:00
Michael Wright
e02bfb6fbd Merge "Add unhandledInputEvent API to ViewRoot" 2014-05-01 21:15:29 +00:00
Mindy Pereira
e3d116a192 am 21a78449: am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit '21a784491775de97dccf7db24a62d942fc2a976f':
  Update fling min velocity
2014-05-01 20:47:28 +00:00
Mindy Pereira
5f81193f80 am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit 'ed7e36dc2ef400916356459f9ea67d66645a85fb':
  Update fling min velocity
2014-05-01 20:43:52 +00:00
Jason Monk
24a68b060e am 961a2a72: Merge "Remove unused AndroidProxySelectorRoutePlanner"
* commit '961a2a72d999aab0109f032633edb5d36b8487e0':
  Remove unused AndroidProxySelectorRoutePlanner
2014-05-01 20:43:34 +00:00
Mindy Pereira
ed7e36dc2e am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit 'd5e92318b69d8af6d91dc3b51738913595e0f536':
  Update fling min velocity
2014-05-01 20:40:08 +00:00
Jason Monk
99013a24a5 Merge "Remove unused AndroidProxySelectorRoutePlanner" 2014-05-01 20:37:22 +00:00
Mindy Pereira
d5e92318b6 Merge "Update fling min velocity" into klp-modular-dev 2014-05-01 20:34:35 +00:00
Jason Monk
80d1f2890c Remove unused AndroidProxySelectorRoutePlanner
Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
2014-05-01 16:34:30 -04:00
Adam Powell
5ba97655c2 am 856b64e9: Add support for hiding action bars on scroll.
* commit '856b64e9d8ab445fcef4504b2e20471cdba04b23':
  Add support for hiding action bars on scroll.
2014-05-01 19:57:10 +00:00
Adam Powell
b36e4f944f 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
2014-05-01 12:45:52 -07:00
John Spurlock
a4a5ba71c1 am cf21f77a: Merge "Implement long-term condition subscriptions."
* commit 'cf21f77a6973e292714af879c36706aa51a8e790':
  Implement long-term condition subscriptions.
2014-05-01 19:21:37 +00:00
John Spurlock
3a8557dc22 Merge "Implement long-term condition subscriptions." 2014-05-01 19:17:53 +00:00
John Spurlock
3b98b3f1f8 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
2014-05-01 15:03:17 -04:00
Matthew Williams
9338ce74d8 am d037be8d: Address comments/fix javadoc in TaskManager API
* commit 'd037be8d485a4cfcc69abb2497c36eb25ca65844':
  Address comments/fix javadoc in TaskManager API
2014-05-01 18:35:22 +00:00
Matthew Williams
57df4fd69e Address comments/fix javadoc in TaskManager API
Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911
2014-05-01 11:28:47 -07:00
Matthew Williams
abb81817ea am a54edd7e: Merge "TaskManager API first pass."
* commit 'a54edd7eb31e641630d594de37b3ee9ce6ddfa61':
  TaskManager API first pass.
2014-05-01 17:49:34 +00:00
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +00:00
Baligh Uddin
bf4927ee0d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-01 16:18:21 +00:00
Baligh Uddin
4fb660cb6a Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:18 +00:00
Alexandra Gherghina
10285c6a92 am 8bb3003f: Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding""
* commit '8bb3003fca6a678fb3df524ed6779dc9210fca86':
  Revert "Temporarily switch off returning only enabled profiles to support dogfooding"
2014-05-01 15:53:54 +00:00
Alexandra Gherghina
973a1d2741 Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 2014-05-01 15:42:07 +00:00
George Mount
e9755a3fba am fa509392: Merge "Fixed transition start delay propagation when duration = 0."
* commit 'fa50939227fc4f1c032229b63291ddb0447e3f9c':
  Fixed transition start delay propagation when duration = 0.
2014-05-01 14:49:41 +00:00
George Mount
794853f61c Merge "Fixed transition start delay propagation when duration = 0." 2014-05-01 14:44:03 +00:00
Narayan Kamath
86a38d235a am afbbbfc0: Fix build.
* commit 'afbbbfc01a1c00f304b5bbae3406afcdc4ed5185':
  Fix build.
2014-05-01 14:41:42 +00:00
Narayan Kamath
4948f0eee8 Fix build.
Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16
2014-05-01 15:37:15 +01:00
Narayan Kamath
3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
2014-05-01 15:32:20 +01:00
George Mount
3d3e681bac am 7056c7e7: Merge "Fix "blink" when going "back" quickly after entering Activity."
* commit '7056c7e7f4393cc80b450b38e327524db95832f6':
  Fix "blink" when going "back" quickly after entering Activity.
2014-05-01 14:18:22 +00:00
George Mount
8df5a07d88 Merge "Fix "blink" when going "back" quickly after entering Activity." 2014-05-01 14:13:01 +00:00
George Mount
265f209d55 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
2014-05-01 07:11:52 -07:00
Narayan Kamath
da3595252b am eceea503: am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
* commit 'eceea503c02075921516653c770483d987d9f36f':
  Implement FileUtils#contains.
2014-05-01 14:04:37 +00:00
Narayan Kamath
69da8a124e am 2a9a0471: Merge "Package manager changes for dual zygote stack."
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.
2014-05-01 14:00:43 +00:00
Narayan Kamath
2e2c7d2325 am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
* commit '6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
  Implement FileUtils#contains.
2014-05-01 14:00:25 +00:00
Narayan Kamath
0338af46f9 am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
  Handle /oem and /vendor as well
2014-05-01 13:57:21 +00:00
Narayan Kamath
6af42aea72 am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.
2014-05-01 13:57:13 +00:00
Narayan Kamath
0349e8c478 Package manager changes for dual zygote stack.
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

(cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
2014-05-01 13:54:48 +00:00
Narayan Kamath
99253c2da9 am fde59428: Merge "Handle /oem and /vendor as well"
* commit 'fde594288bff0b8f95567e6b27f273f50f0c5f87':
  Handle /oem and /vendor as well
2014-05-01 13:53:08 +00:00
Narayan Kamath
9f34234f1c am b916d8ad: Merge "Implement FileUtils#contains."
* commit 'b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
  Implement FileUtils#contains.
2014-05-01 13:52:55 +00:00