OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
Soonil Nagarkar [Tue, 10 Feb 2015 19:20:35 +0000 (19:20 +0000)]
Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."

9 years agoDoze: pulse less often. automerge: 618e420 automerge: 43c7741
John Spurlock [Tue, 10 Feb 2015 19:06:05 +0000 (19:06 +0000)]
Doze: pulse less often. automerge: 618e420 automerge: 43c7741
automerge: 90fc289

* commit '90fc289102465e7c267d3f19f7e3e5c56beb5fc0':
  Doze: pulse less often.

9 years agoAdd @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.
Soonil Nagarkar [Tue, 10 Feb 2015 18:37:36 +0000 (10:37 -0800)]
Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.

Make Intent.ACTION_QUERY_PACKAGE_RESTART and Intent.EXTRA_PACKAGES
accessible from GmsCore so that location and context components can
properly respond to the broadcast.

BUG: 19298558
Change-Id: I4b5cf4991c69d3aa745d03271187c65794df10b2

9 years agoMerge "Set TaskStack config orientation based on dimensions"
Wale Ogunwale [Tue, 10 Feb 2015 18:35:03 +0000 (18:35 +0000)]
Merge "Set TaskStack config orientation based on dimensions"

9 years agoSet TaskStack config orientation based on dimensions
Wale Ogunwale [Sat, 7 Feb 2015 22:04:19 +0000 (14:04 -0800)]
Set TaskStack config orientation based on dimensions

The TaskStack override configuration is set based on the
stack dimensions so we can load the most acturate resources
for activities in the stack in a multi-window environment.

Also, disabled fixed screen orientation for resizeable
activities.

Bug: 19305402
Change-Id: I7b182554523b12f2ef77f8bbc7b16891231125bf

9 years agoMerge "Fix Glop vertex alpha blending"
Chris Craik [Tue, 10 Feb 2015 17:46:18 +0000 (17:46 +0000)]
Merge "Fix Glop vertex alpha blending"

9 years agoDoze: pulse less often. automerge: 618e420
John Spurlock [Tue, 10 Feb 2015 17:40:33 +0000 (17:40 +0000)]
Doze: pulse less often. automerge: 618e420
automerge: 43c7741

* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.

9 years agoDoze: pulse less often.
John Spurlock [Tue, 10 Feb 2015 17:32:27 +0000 (17:32 +0000)]
Doze: pulse less often.
automerge: 618e420

* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
  Doze: pulse less often.

9 years agoMerge "Fix issue with ignoring dpm policy for first call."
Kenny Guy [Tue, 10 Feb 2015 17:14:34 +0000 (17:14 +0000)]
Merge "Fix issue with ignoring dpm policy for first call."

9 years agoFix issue with ignoring dpm policy for first call.
Kenny Guy [Tue, 10 Feb 2015 16:13:11 +0000 (16:13 +0000)]
Fix issue with ignoring dpm policy for first call.

Fix the fact that the first call to
userAllowsPrivateNotificationsInPublic ignores flags
set by the dpm.

Change-Id: Ib6f33edc00f822eb45d13ba2366ddb2c68179e73

9 years agoMerge "Include stack override configurations in onConfigurationChanged() call."
Wale Ogunwale [Tue, 10 Feb 2015 16:53:55 +0000 (16:53 +0000)]
Merge "Include stack override configurations in onConfigurationChanged() call."

9 years agoMerge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion."
Wale Ogunwale [Tue, 10 Feb 2015 16:49:43 +0000 (16:49 +0000)]
Merge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion."

9 years agoam fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is...
Calin Juravle [Tue, 10 Feb 2015 16:30:46 +0000 (16:30 +0000)]
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." automerge: d1e074a
automerge: 16df82d

* commit '16df82d7ace0dbe625211561ccec9b6faf81debb':
  Get the instruction set that the libraries of secondary Abi is supported.

9 years agoam fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is...
Calin Juravle [Tue, 10 Feb 2015 16:23:51 +0000 (16:23 +0000)]
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported."
automerge: d1e074a

* commit 'd1e074a72452c909c7ed2a4baf220d9d2f306b20':
  Get the instruction set that the libraries of secondary Abi is supported.

9 years agoam fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is...
Calin Juravle [Tue, 10 Feb 2015 16:18:27 +0000 (16:18 +0000)]
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported."

* commit 'fd523efcde98e97cd8c088f95198e6e13f4f8b64':
  Get the instruction set that the libraries of secondary Abi is supported.

9 years agoMerge "Get the instruction set that the libraries of secondary Abi is supported."
Calin Juravle [Tue, 10 Feb 2015 16:13:29 +0000 (16:13 +0000)]
Merge "Get the instruction set that the libraries of secondary Abi is supported."

9 years agoMerge "Fix crash in Wifi QS Panel"
Jason Monk [Tue, 10 Feb 2015 15:01:17 +0000 (15:01 +0000)]
Merge "Fix crash in Wifi QS Panel"

9 years agoDoze: pulse less often.
John Spurlock [Tue, 10 Feb 2015 14:10:21 +0000 (09:10 -0500)]
Doze: pulse less often.

Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.

Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b

9 years agoFix crash in Wifi QS Panel
Jason Monk [Thu, 5 Feb 2015 15:34:20 +0000 (10:34 -0500)]
Fix crash in Wifi QS Panel

When open QS wifi panel while wifi was off was causing a crash from
wifi enabling while the WifiTracker was not in a scanning state.
Fix plus a test enclosed.

Bug: 19322090
Change-Id: Id863cdcbf4aa8d50822de3a200355dbaee74b488

9 years agoSplit up android.policy into framework.jar and services.jar 1/3
Jorim Jaggi [Wed, 4 Feb 2015 20:57:40 +0000 (21:57 +0100)]
Split up android.policy into framework.jar and services.jar 1/3

Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4

9 years agoDevicePolicy: clarify wipeData docstring
Robin Lee [Tue, 10 Feb 2015 11:51:00 +0000 (11:51 +0000)]
DevicePolicy: clarify wipeData docstring

Wiping secondary users or profiles does not cause a reboot.

Bug: 19294240
Change-Id: I59179b6d19061067326ea8ef1a730cc21f52ea53

9 years agoMerge "CEC: Define a system property to keep playback device awake"
Jinsuk Kim [Tue, 10 Feb 2015 05:27:27 +0000 (05:27 +0000)]
Merge "CEC: Define a system property to keep playback device awake"

9 years agoCEC: Define a system property to keep playback device awake
Jinsuk Kim [Mon, 9 Feb 2015 22:10:40 +0000 (07:10 +0900)]
CEC: Define a system property to keep playback device awake

Playback device doesn't go to suspend (standby) mode if it's
the active source. This CL makes the behavior configurable through
the system property persist.sys.hdmi.keep_awake.

Bug: 19299723
Change-Id: Icb8b593ab44429ec0520e60d19d0368982ff5667

9 years agoam cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous...
Svetoslav [Tue, 10 Feb 2015 03:33:01 +0000 (03:33 +0000)]
am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
automerge: c052b0e

* commit 'c052b0efcef4c8656a972155c6a88135f79ed808':
  Accessibiltiy: missed update to the previous patch.

9 years agoam cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous...
Svetoslav [Tue, 10 Feb 2015 03:09:20 +0000 (03:09 +0000)]
am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.

* commit 'cf2c8545bd6a8888801fa8c04d263879602eeb36':
  Accessibiltiy: missed update to the previous patch.

9 years agoFix Glop vertex alpha blending
Chris Craik [Tue, 10 Feb 2015 02:58:32 +0000 (18:58 -0800)]
Fix Glop vertex alpha blending

Need to force blending if vertices have alpha attribute

Change-Id: I821792db6b613b4d0243cf9c7a045cba014acdc1

9 years agoam 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
Svetoslav [Tue, 10 Feb 2015 03:01:50 +0000 (03:01 +0000)]
am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.

* commit '5521f39ff75d2af909061581e27810afaa9ed242':
  Accessibiltiy: missed update to the previous patch.

9 years agoam c73cfa0f: Accessibiltiy: missed update to the previous patch.
Svetoslav [Tue, 10 Feb 2015 02:51:30 +0000 (02:51 +0000)]
am c73cfa0f: Accessibiltiy: missed update to the previous patch.

* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
  Accessibiltiy: missed update to the previous patch.

9 years agoAccessibiltiy: missed update to the previous patch.
Svetoslav [Tue, 10 Feb 2015 01:14:28 +0000 (17:14 -0800)]
Accessibiltiy: missed update to the previous patch.

Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d

9 years agoam 2a3cdf57: Merge "Implement array types" automerge: 6e0ad25
Jason Sams [Tue, 10 Feb 2015 01:55:07 +0000 (01:55 +0000)]
am 2a3cdf57: Merge "Implement array types" automerge: 6e0ad25
automerge: ec10f83

* commit 'ec10f833b4276cef130a26d5e4d30935dcd3ef35':
  Implement array types

9 years agoam 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" automerge...
Neil Fuller [Tue, 10 Feb 2015 01:53:21 +0000 (01:53 +0000)]
am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" automerge: 86b9cc3
automerge: 04bd52d

* commit '04bd52d77cd489898555e6c529e7fade7f33bd6d':
  Avoid static initialization of Layout from TextUtils

9 years agoam 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." automerge: da1bd4c
Elliott Hughes [Tue, 10 Feb 2015 01:51:37 +0000 (01:51 +0000)]
am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." automerge: da1bd4c
automerge: aa12224

* commit 'aa122241faf409c1c73872db8d0ab8ac89c9acad':
  Remove obsolete 'numeric_date_template'.

9 years agoam 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case...
Baligh Uddin [Tue, 10 Feb 2015 01:49:40 +0000 (01:49 +0000)]
am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
automerge: a314754

* commit 'a3147545751266f3e58fdadffc4f71e87228c420':
  Accessibility: Handle a missed case when clicking focused views.

9 years agoam 2a3cdf57: Merge "Implement array types"
Jason Sams [Tue, 10 Feb 2015 01:44:11 +0000 (01:44 +0000)]
am 2a3cdf57: Merge "Implement array types"
automerge: 6e0ad25

* commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2':
  Implement array types

9 years agoam 37e5a941: Merge "Avoid static initialization of Layout from TextUtils"
Neil Fuller [Tue, 10 Feb 2015 01:42:41 +0000 (01:42 +0000)]
am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils"
automerge: 86b9cc3

* commit '86b9cc30099cf0836484a5231686cb1d85ebfdca':
  Avoid static initialization of Layout from TextUtils

9 years agoam 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'."
Elliott Hughes [Tue, 10 Feb 2015 01:40:59 +0000 (01:40 +0000)]
am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'."
automerge: da1bd4c

* commit 'da1bd4c01abf9ec3aa5a0d9717a60935304068c4':
  Remove obsolete 'numeric_date_template'.

9 years agoam 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case...
Baligh Uddin [Tue, 10 Feb 2015 01:25:54 +0000 (01:25 +0000)]
am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev

* commit '2083173af997419fbc2e92627fe5500f91ac7e5b':
  Accessibility: Handle a missed case when clicking focused views.

9 years agoam fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking...
Baligh Uddin [Tue, 10 Feb 2015 01:17:42 +0000 (01:17 +0000)]
am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev

* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
  Accessibility: Handle a missed case when clicking focused views.

9 years agoMerge "Camera2: lens shading related HAL3.3 update"
Yin-Chia Yeh [Tue, 10 Feb 2015 01:15:55 +0000 (01:15 +0000)]
Merge "Camera2: lens shading related HAL3.3 update"

9 years agoam b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views...
Baligh Uddin [Tue, 10 Feb 2015 01:07:08 +0000 (01:07 +0000)]
am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev

* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
  Accessibility: Handle a missed case when clicking focused views.

9 years agoMerge "Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.""
Soonil Nagarkar [Tue, 10 Feb 2015 00:58:46 +0000 (00:58 +0000)]
Merge "Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.""

9 years agoMerge "Accessibility: Handle a missed case when clicking focused views." into lmp...
Baligh Uddin [Tue, 10 Feb 2015 00:57:19 +0000 (00:57 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev

9 years agoam cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a...
Andre Eisenbach [Tue, 10 Feb 2015 00:50:06 +0000 (00:50 +0000)]
am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

* commit 'cd623416455100f64ef3f0be7ced27ffc04938a8':
  Add API to check if a Bluetooth connection is encrypted (1/2)

9 years agoRevert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
Soonil Nagarkar [Tue, 10 Feb 2015 00:49:48 +0000 (16:49 -0800)]
Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."

This reverts commit f02fee70e1d3f0281ef7fd6117f118d5c4f7187d.

9 years agoam 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connect...
Andre Eisenbach [Tue, 10 Feb 2015 00:42:55 +0000 (00:42 +0000)]
am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
  Add API to check if a Bluetooth connection is encrypted (1/2)

9 years agoRemove ContextImpl.mOverrideConfiguration to reduce code confusion.
Wale Ogunwale [Tue, 10 Feb 2015 00:35:10 +0000 (16:35 -0800)]
Remove ContextImpl.mOverrideConfiguration to reduce code confusion.

It is not used.

Change-Id: Ie944df17fbc834c54604ea8ff292b6ba0f202690

9 years agoam 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encryp...
Andre Eisenbach [Tue, 10 Feb 2015 00:34:43 +0000 (00:34 +0000)]
am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
  Add API to check if a Bluetooth connection is encrypted (1/2)

9 years agoam 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2...
Andre Eisenbach [Tue, 10 Feb 2015 00:26:51 +0000 (00:26 +0000)]
am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
  Add API to check if a Bluetooth connection is encrypted (1/2)

9 years agoInclude stack override configurations in onConfigurationChanged() call.
Wale Ogunwale [Sun, 8 Feb 2015 00:16:59 +0000 (16:16 -0800)]
Include stack override configurations in onConfigurationChanged() call.

Important for activities that handle configuration changes.

Change-Id: I4d1612026f293fbb99e1abc17e663f0215658ae6

9 years agoMerge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
Andre Eisenbach [Tue, 10 Feb 2015 00:21:35 +0000 (00:21 +0000)]
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

9 years agoMerge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
Soonil Nagarkar [Tue, 10 Feb 2015 00:17:25 +0000 (00:17 +0000)]
Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."

9 years agoMerge "Limit window display frame to size of containing stack"
Wale Ogunwale [Tue, 10 Feb 2015 00:09:07 +0000 (00:09 +0000)]
Merge "Limit window display frame to size of containing stack"

9 years agoAdd @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.
Soonil Nagarkar [Tue, 10 Feb 2015 00:06:08 +0000 (16:06 -0800)]
Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.

Make Intent.ACTION_QUERY_PACKAGE_RESTART and Intent.EXTRA_PACKAGES
accessible from GmsCore so that location and context components can
properly respond to the broadcast.

BUG: 19298558
Change-Id: I8377db7c347068cfdd534e8f85834674f77d4cf3

9 years agoSmall changes to make VolumePanel more testable.
John Spurlock [Fri, 30 Jan 2015 20:48:15 +0000 (15:48 -0500)]
Small changes to make VolumePanel more testable.

- Put a zen call requiring status_bar_service behind
  the controller.
- Make the dialog window params overridable by subclasses.

Bug: 19260237
Change-Id: I2b75cde8a2f7efcd8ac001f181c151597bb7a978

9 years agoMerge "Move AudioService to services."
John Spurlock [Mon, 9 Feb 2015 23:34:42 +0000 (23:34 +0000)]
Merge "Move AudioService to services."

9 years agoam 2a3cdf57: Merge "Implement array types"
Jason Sams [Mon, 9 Feb 2015 23:07:36 +0000 (23:07 +0000)]
am 2a3cdf57: Merge "Implement array types"

* commit '2a3cdf57a47140dfa17114338f83e0bb90054ed1':
  Implement array types

9 years agoMerge "Implement array types"
Jason Sams [Mon, 9 Feb 2015 22:58:13 +0000 (22:58 +0000)]
Merge "Implement array types"

9 years agoam a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection...
Matthew Xie [Mon, 9 Feb 2015 22:22:29 +0000 (22:22 +0000)]
am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
  Separate the protection of mProxyServiceStateCallbacks from that of mService

9 years agoam 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServic...
Matthew Xie [Mon, 9 Feb 2015 22:14:10 +0000 (22:14 +0000)]
am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
  Separate the protection of mProxyServiceStateCallbacks from that of mService

9 years agoMove AudioService to services.
John Spurlock [Sat, 7 Feb 2015 00:46:04 +0000 (19:46 -0500)]
Move AudioService to services.

...and a few dependencies. Move remaining shared items to AudioSystem.

Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5

9 years agoMerge "Delay unmuting on volume down"
RoboErik [Mon, 9 Feb 2015 22:08:05 +0000 (22:08 +0000)]
Merge "Delay unmuting on volume down"

9 years agoam d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbac...
Matthew Xie [Mon, 9 Feb 2015 22:07:50 +0000 (22:07 +0000)]
am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

* commit 'd67aff686d467c439970aef4a57a29838bf005c2':
  Separate the protection of mProxyServiceStateCallbacks from that of mService

9 years agoam a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that...
Matthew Xie [Mon, 9 Feb 2015 21:59:13 +0000 (21:59 +0000)]
am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
  Separate the protection of mProxyServiceStateCallbacks from that of mService

9 years agoMerge "Separate the protection of mProxyServiceStateCallbacks from that of mService...
Matthew Xie [Mon, 9 Feb 2015 21:50:56 +0000 (21:50 +0000)]
Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev

9 years agoMerge "Glop support for indexed quads"
Chris Craik [Mon, 9 Feb 2015 21:49:36 +0000 (21:49 +0000)]
Merge "Glop support for indexed quads"

9 years agoam 9337e595: am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event...
Daniel Sandler [Mon, 9 Feb 2015 21:12:55 +0000 (21:12 +0000)]
am 9337e595: am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev

* commit '9337e595c164307ab9f50374fd35d38de4bc4cd4':
  Added TEXT_CHANGED event to PasswordTextView

9 years agoam be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTex...
Daniel Sandler [Mon, 9 Feb 2015 21:04:25 +0000 (21:04 +0000)]
am be62a5db: am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev

* commit 'be62a5db60adc738e7f5bbe24c04260e7b9b0a4f':
  Added TEXT_CHANGED event to PasswordTextView

9 years agoam 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into...
Daniel Sandler [Mon, 9 Feb 2015 20:55:51 +0000 (20:55 +0000)]
am 96ac73c3: am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev

* commit '96ac73c357a55cada4f22d9a0a4a406c0cb624d2':
  Added TEXT_CHANGED event to PasswordTextView

9 years agoDelay unmuting on volume down
RoboErik [Fri, 6 Feb 2015 23:33:53 +0000 (15:33 -0800)]
Delay unmuting on volume down

This allows the user to turn the volume down before a stream is unmuted by
delaying the unmute call while volume down requests are still being made.

bug:19297183
Change-Id: I65a8e489eb4cbfeace4f539103ee0025584102da

9 years agoam 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
Daniel Sandler [Mon, 9 Feb 2015 20:49:43 +0000 (20:49 +0000)]
am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev

* commit '6e3de6a19af1533a0661975b5440b7c922211d0a':
  Added TEXT_CHANGED event to PasswordTextView

9 years agoam 2b865d7e: am a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to...
Amith Yamasani [Mon, 9 Feb 2015 20:48:58 +0000 (20:48 +0000)]
am 2b865d7e: am a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev

* commit '2b865d7e16e19df76f01982b90e647e873098f51':
  Limit cache update to packages that have changed

9 years agoMerge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
Daniel Sandler [Mon, 9 Feb 2015 20:43:37 +0000 (20:43 +0000)]
Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev

9 years agoam a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to packages that...
Amith Yamasani [Mon, 9 Feb 2015 20:41:55 +0000 (20:41 +0000)]
am a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev

* commit 'a6318cd7f29c87bce2dfe9b74ff4a89c945be591':
  Limit cache update to packages that have changed

9 years agoam d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed...
Amith Yamasani [Mon, 9 Feb 2015 20:29:39 +0000 (20:29 +0000)]
am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev

* commit 'd09878c13c392b81633f4f748a85718cebd9f325':
  Limit cache update to packages that have changed

9 years agoam 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
Amith Yamasani [Mon, 9 Feb 2015 20:05:32 +0000 (20:05 +0000)]
am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev

* commit '61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
  Limit cache update to packages that have changed

9 years agoMerge "Limit cache update to packages that have changed" into lmp-mr1-dev
Amith Yamasani [Mon, 9 Feb 2015 19:59:26 +0000 (19:59 +0000)]
Merge "Limit cache update to packages that have changed" into lmp-mr1-dev

9 years agoam df890b4d: am 082f0bf3: am df608e39: am 3d521c0a: Merge "Perform post installation...
Rubin Xu [Mon, 9 Feb 2015 19:57:03 +0000 (19:57 +0000)]
am df890b4d: am 082f0bf3: am df608e39: am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

* commit 'df890b4df04f77baaa0051b6cc0d92c82acf3aa9':
  Perform post installation operations directly if backup manager is disabled

9 years agoam 082f0bf3: am df608e39: am 3d521c0a: Merge "Perform post installation operations...
Rubin Xu [Mon, 9 Feb 2015 19:49:04 +0000 (19:49 +0000)]
am 082f0bf3: am df608e39: am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

* commit '082f0bf3bd0f266f776f4b28c3fb8dc917cd0d63':
  Perform post installation operations directly if backup manager is disabled

9 years agoam df608e39: am 3d521c0a: Merge "Perform post installation operations directly if...
Rubin Xu [Mon, 9 Feb 2015 19:41:19 +0000 (19:41 +0000)]
am df608e39: am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

* commit 'df608e39b35e37490f8752b0902d9894f8d8940b':
  Perform post installation operations directly if backup manager is disabled

9 years agoam 3d521c0a: Merge "Perform post installation operations directly if backup manager...
Rubin Xu [Mon, 9 Feb 2015 19:33:19 +0000 (19:33 +0000)]
am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

* commit '3d521c0a0165dfef53e3c9d3d562bc0ec45405a8':
  Perform post installation operations directly if backup manager is disabled

9 years agoCamera2: lens shading related HAL3.3 update
Yin-Chia Yeh [Fri, 6 Feb 2015 23:15:53 +0000 (15:15 -0800)]
Camera2: lens shading related HAL3.3 update

Codegen doc update.

Change-Id: I0e997b3e6fde7636bef3accdd0f8b7b969d37afa

9 years agoAdd API to check if a Bluetooth connection is encrypted (1/2)
Andre Eisenbach [Fri, 6 Feb 2015 04:06:33 +0000 (20:06 -0800)]
Add API to check if a Bluetooth connection is encrypted (1/2)

Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c

9 years agoMerge "Perform post installation operations directly if backup manager is disabled...
Rubin Xu [Mon, 9 Feb 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

9 years agoMerge "Camera2: doc update for HAL3.3 tonemapping change"
Yin-Chia Yeh [Mon, 9 Feb 2015 19:11:54 +0000 (19:11 +0000)]
Merge "Camera2: doc update for HAL3.3 tonemapping change"

9 years agoLimit cache update to packages that have changed
Amith Yamasani [Fri, 6 Feb 2015 22:41:40 +0000 (14:41 -0800)]
Limit cache update to packages that have changed

When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889

9 years agoMerge "Camera2: add precapture trigger CANCEL"
Zhijun He [Mon, 9 Feb 2015 19:07:22 +0000 (19:07 +0000)]
Merge "Camera2: add precapture trigger CANCEL"

9 years agoGlop support for indexed quads
Chris Craik [Fri, 6 Feb 2015 23:25:51 +0000 (15:25 -0800)]
Glop support for indexed quads

bug:19014311
Change-Id: If35a873421b41cc4508b0d8ac1b4d900c9bb3717

9 years agoCamera2: add precapture trigger CANCEL
Zhijun He [Mon, 9 Feb 2015 18:40:49 +0000 (10:40 -0800)]
Camera2: add precapture trigger CANCEL

Bug: 19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Feb 2015 18:21:41 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 18:08:39 +0000 (10:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: If91f690e322f7497ee10c6effc513e78654dda3c
Auto-generated-cl: translation import

9 years agoam 37e5a941: Merge "Avoid static initialization of Layout from TextUtils"
Neil Fuller [Mon, 9 Feb 2015 17:35:00 +0000 (17:35 +0000)]
am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils"

* commit '37e5a941edb0ac5db6a4a4690827fa113c5443b1':
  Avoid static initialization of Layout from TextUtils

9 years agoMerge "Avoid static initialization of Layout from TextUtils"
Neil Fuller [Mon, 9 Feb 2015 17:29:59 +0000 (17:29 +0000)]
Merge "Avoid static initialization of Layout from TextUtils"

9 years agoam 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
Adrian Roos [Mon, 9 Feb 2015 16:41:32 +0000 (16:41 +0000)]
am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
automerge: fc7e8f0

* commit 'fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba':
  Only request IME if password view is showing

9 years agoam 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
Adrian Roos [Mon, 9 Feb 2015 16:38:42 +0000 (16:38 +0000)]
am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing

* commit '270496ef13b6baba1f0749d8c282262b021ff18e':
  Only request IME if password view is showing

9 years agoam c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:34:45 +0000 (16:34 +0000)]
am c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
automerge: 75a10fe  -s ours

* commit '75a10fe80778f4ac31caaf33ef2c052a391869c9':
  Import translations. DO NOT MERGE

9 years agoam c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:31:31 +0000 (16:31 +0000)]
am c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 4e4c37a2: am 991db77a: Only request IME if password view is showing
Adrian Roos [Mon, 9 Feb 2015 16:30:40 +0000 (16:30 +0000)]
am 4e4c37a2: am 991db77a: Only request IME if password view is showing

* commit '4e4c37a2da064cf0d4bbd508a186a6c44563d966':
  Only request IME if password view is showing

9 years agoam 991db77a: Only request IME if password view is showing
Adrian Roos [Mon, 9 Feb 2015 16:07:32 +0000 (16:07 +0000)]
am 991db77a: Only request IME if password view is showing

* commit '991db77a44f3352a8cf6351f79cad67bf955e4e4':
  Only request IME if password view is showing

9 years agoam 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'."
Elliott Hughes [Mon, 9 Feb 2015 16:07:11 +0000 (16:07 +0000)]
am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'."

* commit '77a8f9d2deaa16ec381b7d5ecf738810219461f7':
  Remove obsolete 'numeric_date_template'.

9 years agoam fba2dcc0: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:07:09 +0000 (16:07 +0000)]
am fba2dcc0: (-s ours) Import translations. DO NOT MERGE

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