142197 Commits

Author SHA1 Message Date
Elliott Hughes
f6be5a7ac8 am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.
2014-07-10 00:16:29 +00:00
Robert Ly
10c286d657 am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
* commit 'cc2af1c010ae896ef6aea7c428876ea5d9a7dc73':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
2014-07-10 00:11:33 +00:00
Elliott Hughes
3964ea4675 am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit 'd74f99d390d9a0e1c800ee68b1bc39c210aca989':
  Switch frameworks/base/libs/androidfw to the new icu.
2014-07-10 00:08:33 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
2014-07-10 00:08:29 +00:00
Quddus Chong
8e086faf89 am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.
* commit '9afee0df49ce019bf8c8d1c7dc15857949637ccf':
  docs: Added missing instructions for copying the Google Play Services library project.
2014-07-09 23:02:01 +00:00
Quddus Chong
9afee0df49 docs: Added missing instructions for copying the Google Play Services library project.
Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17
2014-07-09 15:49:17 -07:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu.
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
2014-07-09 16:56:11 -07:00
Kenny Guy
bc99305dae Merge "Remove old listeners from LauncherApps." 2014-07-09 19:47:58 +00:00
Kenny Guy
44b6dee70e Remove old listeners from LauncherApps.
Removed functions kept to support
transition from old api names to new.
Fix bug with attempting to remove from
listeners rather than callbacks list.

Bug: 15518265
Change-Id: Ief08a6bd8289608875c1cbf5af9a4389c6e9adfd
2014-07-10 18:14:42 +01:00
Julia Reynolds
3ff3db5f5c Merge "INSTALL_NON_MARKET_APPS lives in Secure again." 2014-07-10 00:38:28 +00:00
Julia Reynolds
25838509d8 INSTALL_NON_MARKET_APPS lives in Secure again.
Change-Id: Ib3c7a48b8dc2d649f2f6c8e8cd822ab342634afd
2014-07-10 12:29:40 -04:00
RoboErik
a12a9a5d4a Merge "Pipe volume keys to adjustVolume instead of sendMediaKeyEvent" 2014-07-10 01:20:57 +00:00
RoboErik
3c45c29109 Pipe volume keys to adjustVolume instead of sendMediaKeyEvent
We were calling sendMediaKeyEvent with a KEYCODE_VOLUME key, which was being
ignored because it's not a media key. This redirects the volume keys to use
the adjustVolume methods instead. It also sends the appropriate flags to
make the lock screen consistent with the home screen and the volume keys
only affect active playback when the screen is off.

bug:15900519
Change-Id: I9f3853a2385869353a58debae6e6ca9933ba06ce
2014-07-10 16:15:45 +00:00
George Mount
b5ef7f8c6d Don't change View visibility during activity transitions.
Bug 16187776

Changing View visibility can change the View's focused item.
To prevent this, a backdoor is introduced into Transition
and Visiblity to set the target Visibility used in Activity Transitions.

Change-Id: Idfd2c6fba2cad80fecdfd086990ddc604f86ca68
2014-07-10 16:01:46 +00:00
Niels Egberts
2e3f2c6727 Add more semiotic class types for TtsSpan.
Change-Id: I4c5f141f56d6ec679be59634693f591e3386f152
2014-07-10 15:29:56 +00:00
Przemyslaw Szczepaniak
cafd15216e Fix TTS regression, TTS#stop can result in #onDone callback.
Regressinon in the L, side effect of the rewrite. In pre-L android,
UtteranceProgressListener#onDone was called (but only if client
received UtteranceProgressListener#onStart for the utterance in progress)
after client called TextToSpeech#stop. This changeset reinstates
this behaviour.
+ Removed not used fallback callback

Bug: 16149006
Change-Id: I2eb5ede0abe6f5717b07f09adad861465575c238
2014-07-10 14:32:31 +00:00
Eino-Ville Talvala
8ce1544edb Merge "Camera2: Update capabilities metadata" 2014-07-10 00:46:47 +00:00
Eino-Ville Talvala
08bc3b0f02 Camera2: Update capabilities metadata
Change-Id: Ic2dc18f535cbc34a1504a6a746e7f7303fa6e839
2014-07-10 17:06:59 +00:00
Fabrice Di Meglio
2331e9ebad Add userId as a new field for SearchIndexableData
See bug: #15837747 Search - update for Enterprise support

Change-Id: I1231f8870754aafa449a4c17350be70b524da230
2014-07-10 16:39:08 +00:00
Eino-Ville Talvala
5228dcdc82 Merge "camera2: Document CameraCaptureSession behavior given 0 Surfaces" 2014-07-10 00:35:26 +00:00
Sol Boucher
edeab40338 camera2: Document CameraCaptureSession behavior given 0 Surfaces
Clarify that this will cause an IllegalArgumentException to be thrown

Change-Id: Ifabfed6d8d46492c4ca45bbbed599ded5260b099
2014-07-09 18:36:28 -07:00
Jorim Jaggi
6bdc9bae74 Merge "Add glyph rerasterization hack for SystemUI." 2014-07-09 20:06:40 +00:00
Jorim Jaggi
362dd6d632 Add glyph rerasterization hack for SystemUI.
Change-Id: I39d84e981b828b501801349d7a5e70a089b5f14e
2014-07-10 01:07:44 +00:00
Stephen Hines
770a6cafad am 0bf5cfc0: am 8348c351: am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."
* commit '0bf5cfc0b3e10265e47920d6ed5b65f94a5a178a':
  Update copyFrom(BaseObj[]) for large objects.
2014-07-10 00:50:12 +00:00
Elliott Hughes
5430d3a4c9 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-07-10 00:43:07 +00:00
Elliott Hughes
e8e968a7c6 am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit '583a845c6eb6308d7ada72cb0e91444efc91cc54':
  Switch frameworks/base/libs/androidfw to the new icu.
2014-07-10 00:42:48 +00:00
Elliott Hughes
b58d385e17 resolved conflicts for merge of f6be5a7a to master
Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
2014-07-09 17:40:24 -07:00
Adrian Roos
74185a3982 Merge "Add AlarmClock API to AlarmManager" 2014-07-10 00:35:26 +00:00
Adrian Roos
c42a1e1071 Add AlarmClock API to AlarmManager
Adds a new kind of alarm that represents an alarm clock and
a way to query the next scheduled alarm clock.

Deprecates Settings.System.NEXT_ALARM_FORMATTED.

Bug: 14589952
Change-Id: I297eeeff36d07adcda010afac183d0f5ee37dc99
2014-07-10 17:07:36 +00:00
Robert Ly
051a3204d4 am 10c286d6: am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev
* commit '10c286d657c93c8b80b8d336661569256749f39e':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
2014-07-10 00:19:56 +00:00
Dianne Hackborn
24f06d2440 Merge "Get rid of security exception spam during boot." 2014-07-09 22:27:31 +00:00
Dianne Hackborn
ddef7e776b Get rid of security exception spam during boot.
Change-Id: If7a516e463722280bf597f7dd601e7a0f6e379c8
2014-07-09 17:41:47 -07:00
Niels Egberts
931a0e27e1 Merge "Remove Markup and Utterance classes." 2014-07-09 19:47:58 +00:00
Yuncheol Heo
eeba0257a7 Tag hole-punching api with @SystemApi.
Change-Id: I50c27c32abd7e6d2404c451fb53cfb1379b88e00
2014-07-10 20:03:57 +09:00
Yuncheol Heo
e9b9b1e784 Verify the CEC message source and the destination.
- Depending on the message type, the direct destination or the broadcast
  destination can't be used, and neither the unregistered source can be
  allowed.

Change-Id: I7fe2151025afbf155ae663331d5d97d4910c4a98
2014-07-10 19:38:04 +09:00
Sailesh Nepal
3e9090524a Merge "Add Connection.setCallCapabilities" 2014-07-09 21:34:29 +00:00
Sailesh Nepal
1a7061ba95 Add Connection.setCallCapabilities
This will be used to enable things like hold and
conferencing.

Change-Id: I90238eeefbcbfaa044881d80833b62e4474821d6
2014-07-09 23:20:41 -07:00
Adam Powell
4f6c2050a8 ResolverDrawerLayout for ResolverActivity
Internal widget to allow nested scrolling of the grid of intent filter
targets. Initial logic complete.

Bug 15694906

Change-Id: Ib19723146bf1722db6bdd68f95cc6e623462d0f0
2014-07-09 23:16:15 -07:00
Narayan Kamath
70779c71dd Merge "Multi-arch application installs." 2014-07-09 19:47:58 +00:00
Narayan Kamath
ff110bd61a Multi-arch application installs.
Each application now has two ABIs, the primary
and the secondary. The app is always launched with
the primary, but the secondary might be used by other apps
that load the given applications code. This implies we
must:

- dex2oat the app both ways.
- extract shared libraries for both abis.

The former is relatively straightforward but the latter
requires us to change the layout for shared libs that we
unpack from applications. The bulk of this change deals
with the latter.

This change continues to fill in nativeLibraryPath during
scans for backwards compatibility. This will be removed in
a future patch.

Change-Id: Ia943dd11ef815c5cbfc60f17929eaa2a652a385a
2014-07-10 17:16:14 +01:00
Jorim Jaggi
f924e9507b Merge "Add battery level in status bar on Keyguard when charging" 2014-07-09 19:47:57 +00:00
Colin Cross
0161bbc6e5 ActivityManager: use Process.killProcessGroup to kill forked processes
Place newly-created processes in a process group, and use
killProcessGroup to kill any forked processes.

Bug: 15313911
Change-Id: I0f3e2eeebd9a910dae3f6b2801826c92aea03030
2014-07-10 19:51:04 +00:00
Jorim Jaggi
d4aafe9b70 Add battery level in status bar on Keyguard when charging
Also fixes flickering in the header when overscrolling the
notifications.

Change-Id: I3d6aa95e364298718c6d8b050a1091e7ccd7609d
2014-07-10 21:44:01 +02:00
Fabrice Di Meglio
83c0fdd100 Update SearchIndexablesContract for adding UserId
See bug: ##15837747 Search - update for Enterprise support

Change-Id: I8f2d33e570240ec2f002c74e2a19f675b4d744f8
2014-07-10 19:22:46 +00:00
Robert Greenwalt
7237965c0d Merge "Refactor wifi p2p's startDhcpServer function" 2014-07-10 18:27:37 +00:00
Robert Greenwalt
9c7e2c2cb4 Refactor wifi p2p's startDhcpServer function
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering to update dhcp ranges.  This will allow
p2p apps to run well concurently with other tethering apps.

Manual import of AOSP change 81546 by jianzheng.zhou@freescale.com

Change-Id: Iebc62f95bdcedde80e2c1d3e9580d3f625c3b50b
2014-07-10 18:56:12 +00:00
Alan Viverette
503dca6f58 Merge "Add API for specifying popup window shadows and shadow insets" 2014-07-10 16:04:18 +00:00
Santos Cordon
9bc2acd454 Merge "Some string cleanup." 2014-07-10 16:04:18 +00:00
Santos Cordon
3319c16f5a Some string cleanup.
Change-Id: Icf8ec1cb162353e24d6982f36e94691ead722eac
2014-07-10 19:20:29 +00:00