Commit Graph

39417 Commits

Author SHA1 Message Date
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +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
Yohei Yukawa
a1223cfe6f Take supportsSwitchingToNextInputMethod into considertaion
With this CL, InputMethodManager#switchToNextInputMethod starts
behaving as if there are two rotation groups: one is for the new
input methods that are declared with
supportsSwitchingToNextInputMethod set to true to indicate they
have some language switching UI, and the other is for the other
input methods to preserve the existing behavior.

In addition to the above change, this CL also fixes the behavior
of InputMethodManager#shouldOfferSwitchingToNextInputMethod()
so as to return true if and only if the former rotation group
consists of two or more input methods, as originally designed.

BUG: 12981505
Change-Id: I84291fd4a7d6192b3bd0c366c49586e79135584f
2014-05-01 22:52:16 +09:00
Christopher Tate
c84471c2e0 Handle /oem and /vendor as well
Bug 13170859

(cherry-picked from commit 740888f62e)

Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
2014-05-01 13:51:33 +00:00
Narayan Kamath
d6d1dbac3f Implement FileUtils#contains.
Partial cherry-pick of changes 4ca728c0 and 21de56a9, which
can't be cherry-picked due to their large surface area.

Change-Id: Ife46e150d360cd5241dea93863141749233c1805
2014-05-01 14:01:44 +01:00
Alexandra Gherghina
cc275f3444 am 169ebe98: Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
* commit '169ebe98aeb8d1f725208da92585bc7a7a99aff8':
  Adds an enabled state in UserInfo instead of DevicePolicyManager
2014-05-01 10:52:32 +00:00
Alexandra Gherghina
3c4d9c56db Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager" 2014-05-01 10:49:21 +00:00
Yohei Yukawa
09ffc826cc am fdbedeb6: Merge "Add unit tests for InputMethodSubtypeSwitchingController"
* commit 'fdbedeb6f365fcbb9ab796ed5953d35ef3f3978a':
  Add unit tests for InputMethodSubtypeSwitchingController
2014-05-01 10:38:28 +00:00
Alexandra Gherghina
df35d570ed Adds an enabled state in UserInfo instead of DevicePolicyManager
Bug: 14377459
Change-Id: Ib4ec43d87da96c3dddaf9b7ae1796f261863a182
2014-05-01 11:34:27 +01:00
Yohei Yukawa
8596f6998e Merge "Add unit tests for InputMethodSubtypeSwitchingController" 2014-05-01 10:34:05 +00:00
Yohei Yukawa
d1da115298 Add unit tests for InputMethodSubtypeSwitchingController
This CL adds unit tests for InputMethodSubtypeSwitchingController
as a ground work to make it aware of
supportsSwitchingToNextInputMethod in a subsequent CL.

This CL never changes existing behavior.

BUG: 12981505
Change-Id: I3b2c46c47c7686b811fa248ad549f20875367425
2014-05-01 19:13:25 +09:00
Nicolas Prevot
6483a805d4 am 4cd07224: Merge "Introduce forwarding intents across profiles."
* commit '4cd07224df582d6b6f9be5b1d04ab65bbd00d3f7':
  Introduce forwarding intents across profiles.
2014-05-01 09:20:35 +00:00
Nicolas Prevot
ff2e05e1f6 Merge "Introduce forwarding intents across profiles." 2014-05-01 09:17:13 +00:00
Jeff Davidson
14f1ec05b2 API for network cache subsystems.
A network subsystem (e.g. Wi-Fi) will be responsible for implementing
INetworkScoreCache. NetworkScoreService will load caches for each
configured network subsystem. When it receives a call to update
scores, it will separate the networks by type and call updateScores on
the appropriate INetworkScoreCache.

Each subsystem will also be responsible for requesting scores for new
networks by calling NetworkScoreManager#requestScores.

Bug: 14408144
Bug: 14137255
Change-Id: I76e5e5205bc359c39d6b9c1782126fb7f465cd96
2014-04-30 17:50:46 -07:00
Mindy Pereira
23ffc73abd Update fling min velocity
Make it configurable for watch

Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
2014-04-30 17:17:10 -07:00
George Mount
1a5b294d39 Fix "blink" when going "back" quickly after entering Activity.
Bug 14445508

Activity Transitions would occasionally blink to black when
going "back." This was caused because the convertToTranslucent
callback was slow to come and could occur during the exit
transition while going back.

Change-Id: I17db25197926399dc22b50c595416dfa7b32b026
2014-04-30 16:59:31 -07:00
Michael Wright
8f04cd6cb2 am d404631d: am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit 'd404631d178edef95170b89f9613318a989cbbfa':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 23:32:55 +00:00
Michael Wright
a2dc6fab5e am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '474b07497bf1a33ccc889d21287269cd40dc0cf4':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 23:28:28 +00:00
Kristian Monsen
18b9812ba3 am 1efcbb7b: Merge "Try to not start up chromium when not needed"
* commit '1efcbb7bbdeac3540aa418de7c39f74da32d1a19':
  Try to not start up chromium when not needed
2014-04-30 21:45:35 +00:00
Kristian Monsen
b56ddaaf0e Merge "Try to not start up chromium when not needed" 2014-04-30 21:40:31 +00:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:11:05 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +00:00
Nicolas Prevot
10fa67c77e Introduce forwarding intents across profiles.
The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.

When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.

Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
2014-04-30 19:24:52 +01:00
Kenny Guy
76f08ee7df am 56afa6d5: Merge "Extend LauncherApps service to expose enabled state."
* commit '56afa6d53216541aa397b051ab74c130f488cd96':
  Extend LauncherApps service to expose enabled state.
2014-04-30 17:39:33 +00:00
Kenny Guy
7e5264ced7 Merge "Extend LauncherApps service to expose enabled state." 2014-04-30 17:38:10 +00:00
Alexandra Gherghina
f2e7b3f56a Revert "Temporarily switch off returning only enabled profiles to support dogfooding"
This reverts commit 199c35a21ea9bddde80fdb435ec604f729b0cbe7 because client code has been updated.

Bug: 14132551
Change-Id: I7159087dfaded6f2bfe90ef103f74b242acb166c
2014-04-30 17:01:03 +00:00
Dianne Hackborn
c96190e9fe am c6890f9f: Merge "Switch IProcessObserver to report process state"
* commit 'c6890f9f517f7b09594ebb6aaf5b338fb905b32f':
  Switch IProcessObserver to report process state
2014-04-30 16:43:13 +00:00
Dianne Hackborn
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +00:00
Christoph Studer
03b87a2f40 Log notification clicks
Emit notification_clicked log events when a notification
is clicked from SystemUI.

Also refactor the onNotificationClicked method to work with
a key instead of individual notification params.

Change-Id: Iffd15e95d46371b2ae7bfd00b2c348d9f4cf5d14
2014-04-30 18:00:55 +02:00
Christoph Studer
ff8dbe52eb Add userId to StatusBarNotification key
Change-Id: Id2db95ec128b364c8a7df1272b2ee3144e3da3de
2014-04-30 17:59:00 +02:00
George Mount
b0b8c005d7 am 50642dc0: Merge "Fix NPE when going "back" from Activity Transition."
* commit '50642dc0c1d2942113e8a2880f0c709af43463a3':
  Fix NPE when going "back" from Activity Transition.
2014-04-30 14:30:29 +00:00
George Mount
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +00:00