OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Fix typo causing immersive mode transition flickering."
Adrian Roos [Tue, 20 May 2014 14:10:06 +0000 (14:10 +0000)]
Merge "Fix typo causing immersive mode transition flickering."

10 years agoAdd to activity transition API as requested by consumers.
George Mount [Mon, 19 May 2014 14:09:00 +0000 (07:09 -0700)]
Add to activity transition API as requested by consumers.

Change-Id: Iae01d7560770bab0ff9a1728d6552b98b17108ce

10 years agoMerge "Fix reference to ProxyInfo extra"
Jason Monk [Tue, 20 May 2014 12:59:51 +0000 (12:59 +0000)]
Merge "Fix reference to ProxyInfo extra"

10 years agoMerge "Fixed measuring and layouting of the more card and expandableviews."
Selim Cinek [Tue, 20 May 2014 12:48:21 +0000 (12:48 +0000)]
Merge "Fixed measuring and layouting of the more card and expandableviews."

10 years agoFixed measuring and layouting of the more card and expandableviews.
Selim Cinek [Tue, 20 May 2014 11:50:57 +0000 (13:50 +0200)]
Fixed measuring and layouting of the more card and expandableviews.

Change-Id: I2848b39c6498ce9ad197ed7bad8423c74b372419

10 years agoFix typo causing immersive mode transition flickering.
Adrian Roos [Tue, 20 May 2014 11:48:01 +0000 (13:48 +0200)]
Fix typo causing immersive mode transition flickering.

Bug: 15095056
Change-Id: Ibc75bb4f61070f4cf00756ab1a216255e38932af

10 years agoFix the wrong conversion of byte to int.
Yuncheol Heo [Tue, 20 May 2014 10:49:58 +0000 (19:49 +0900)]
Fix the wrong conversion of byte to int.

Because 'byte' type is signed, we need a mask when converting it to 'int' type.

Change-Id: I3a8fcb38c9d108c0280d66301e29144391807401

10 years agoam cd98ecc6: am 6071e45a: Merge "add a command to list all bonded devices" into klp...
Guang Zhu [Tue, 20 May 2014 09:58:35 +0000 (09:58 +0000)]
am cd98ecc6: am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev

* commit 'cd98ecc66b968c5d5d0d12522c4c8c9b848bf181':
  add a command to list all bonded devices

10 years agoRemove a hide tag link.
Wei Wang [Tue, 20 May 2014 09:43:02 +0000 (02:43 -0700)]
Remove a hide tag link.

Change-Id: I6781dcfcaf89c6b00e0641549f946b90e4543218

10 years agoam e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp...
Ben Murdoch [Tue, 20 May 2014 09:39:05 +0000 (09:39 +0000)]
am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev

* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.

10 years agoMerge "Add PackagManager flag for WebView system feature." into klp-modular-dev
Ben Murdoch [Tue, 20 May 2014 09:32:42 +0000 (09:32 +0000)]
Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev

10 years agoam 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master
Michael Wright [Tue, 20 May 2014 09:28:40 +0000 (09:28 +0000)]
am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master

* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size

10 years agoam 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 09:26:18 +0000 (09:26 +0000)]
am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev

* commit '6071e45a64ab764eb86603f2f4496cfd5c8de708':
  add a command to list all bonded devices

10 years agoRevert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multip...
Wei Wang [Tue, 20 May 2014 06:30:20 +0000 (06:30 +0000)]
Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising.""

This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88

10 years agoMerge "Make mSessionCallback null in TvView.unbindTvInput"
Youngsang Cho [Tue, 20 May 2014 05:55:21 +0000 (05:55 +0000)]
Merge "Make mSessionCallback null in TvView.unbindTvInput"

10 years agoresolved conflicts for merge of 32912e0a to stage-aosp-master
Michael Wright [Tue, 20 May 2014 05:42:58 +0000 (22:42 -0700)]
resolved conflicts for merge of 32912e0a to stage-aosp-master

Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26

10 years agoMake mSessionCallback null in TvView.unbindTvInput
Youngsang Cho [Tue, 20 May 2014 05:37:01 +0000 (14:37 +0900)]
Make mSessionCallback null in TvView.unbindTvInput

Bug: 15096705
Change-Id: I5a13f9ad648bafc76667cbda39bcb138cfbc5de2

10 years agoRevert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple adver...
Wei Wang [Tue, 20 May 2014 04:52:35 +0000 (04:52 +0000)]
Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising."

This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80.

Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6

10 years agoMerge "add a command to list all bonded devices" into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 04:36:47 +0000 (04:36 +0000)]
Merge "add a command to list all bonded devices" into klp-modular-dev

10 years agoadd a command to list all bonded devices
Guang Zhu [Tue, 20 May 2014 04:34:25 +0000 (21:34 -0700)]
add a command to list all bonded devices

Bug: 14601515

Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329

10 years agoChange visibility of TvInputManager.Session.setSurface()
Wonsik Kim [Tue, 20 May 2014 04:26:36 +0000 (13:26 +0900)]
Change visibility of TvInputManager.Session.setSurface()

Change the visibility from package private to @hide public. This is
to enable use case of TvInputServices wrapping another
TvInputServices so that it can pass the Surface object it has to the
wrapped service.

Change-Id: Ib1cdc4992a26f2adca099077cb9fa7f8b41c3163

10 years agoFix 64 bit long pointer size for media scanning
Andy Hung [Tue, 20 May 2014 04:18:18 +0000 (21:18 -0700)]
Fix 64 bit long pointer size for media scanning

Bug: 14993718
Change-Id: I98989caddcca67c2b3257cead948382fddb066da

10 years agoMerge "wallpaper: limit wallpaper width to sys.max_texture_size"
Michael Wright [Tue, 20 May 2014 04:04:00 +0000 (04:04 +0000)]
Merge "wallpaper: limit wallpaper width to sys.max_texture_size"

10 years agowallpaper: limit wallpaper width to sys.max_texture_size
Donghan Ryu [Tue, 15 Nov 2011 02:56:11 +0000 (18:56 -0800)]
wallpaper: limit wallpaper width to sys.max_texture_size

Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4

10 years agoAPIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple
Wei Wang [Thu, 17 Apr 2014 01:49:18 +0000 (18:49 -0700)]
APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple
advertising.

Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03

10 years agoAdd a method to check whether a UUID is 32bit.
Wei Wang [Wed, 7 May 2014 21:54:43 +0000 (14:54 -0700)]
Add a method to check whether a UUID is 32bit.

Change-Id: I92e8bab560b2083e9f4855d28b3f54f2120ef628

10 years agoMerge "Fixed a big with the vetobutton, circumventing double tapping."
Selim Cinek [Tue, 20 May 2014 02:27:17 +0000 (02:27 +0000)]
Merge "Fixed a big with the vetobutton, circumventing double tapping."

10 years agoFixed a big with the vetobutton, circumventing double tapping.
Selim Cinek [Tue, 20 May 2014 02:20:25 +0000 (04:20 +0200)]
Fixed a big with the vetobutton, circumventing double tapping.

Change-Id: Ie31d06fe4e2454cf6a3223bef75eca2c76f47b59

10 years agoAudioSystem: add new audio device definitions
Eric Laurent [Fri, 16 May 2014 22:18:45 +0000 (15:18 -0700)]
AudioSystem: add new audio device definitions

Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457

10 years agoMerge "Fixed several bugs introduced by the new background views."
Selim Cinek [Tue, 20 May 2014 01:42:46 +0000 (01:42 +0000)]
Merge "Fixed several bugs introduced by the new background views."

10 years agoFixed several bugs introduced by the new background views.
Selim Cinek [Tue, 20 May 2014 01:33:40 +0000 (03:33 +0200)]
Fixed several bugs introduced by the new background views.

Also notifications are now limited to 4U again.
Bug: 14880580

Change-Id: I05d19981ad1bb06687bf6c994608e21ac925a759

10 years agoMerge "QuickSettings: cap touch feedback to panel."
John Spurlock [Tue, 20 May 2014 01:13:02 +0000 (01:13 +0000)]
Merge "QuickSettings: cap touch feedback to panel."

10 years agoQuickSettings: cap touch feedback to panel.
John Spurlock [Tue, 20 May 2014 01:11:14 +0000 (21:11 -0400)]
QuickSettings: cap touch feedback to panel.

Bug:15089348
Change-Id: I0d9cc21d9888e1cc67f61c61dfae5e6c519ace1b

10 years agoMerge "Move the non-market install setting from Global to per-user Secure"
Christopher Tate [Tue, 20 May 2014 01:10:04 +0000 (01:10 +0000)]
Merge "Move the non-market install setting from Global to per-user Secure"

10 years agoMove the non-market install setting from Global to per-user Secure
Christopher Tate [Mon, 19 May 2014 23:33:27 +0000 (16:33 -0700)]
Move the non-market install setting from Global to per-user Secure

Bug 13760585

Change-Id: I45b0fa87e72dc5c18d687261fb95cbea5d06163a

10 years agoMerge "Allow adding a user while still removing other users"
Amith Yamasani [Tue, 20 May 2014 01:02:58 +0000 (01:02 +0000)]
Merge "Allow adding a user while still removing other users"

10 years agoAllow adding a user while still removing other users
Amith Yamasani [Tue, 20 May 2014 00:57:25 +0000 (17:57 -0700)]
Allow adding a user while still removing other users

When at the user limit, removing and adding a user causes a race
condition where the deleted user is still being removed and adding
another one fails.

This change excludes deleted users from the counting to compare
against the limit.

Also fix an ArrayIndexOutOfBounds recently introduced in AppOpsService.

Bug: 13282768
Change-Id: Ib79659e7604396583a280dbbc560b288a6d9051c

10 years agoMerge "Fix infinite loop in TrustManagerService exception handler."
Jim Miller [Tue, 20 May 2014 00:50:05 +0000 (00:50 +0000)]
Merge "Fix infinite loop in TrustManagerService exception handler."

10 years agoMerge "Dump the countdown condition, if active."
John Spurlock [Tue, 20 May 2014 00:46:08 +0000 (00:46 +0000)]
Merge "Dump the countdown condition, if active."

10 years agoDump the countdown condition, if active.
John Spurlock [Tue, 20 May 2014 00:43:48 +0000 (20:43 -0400)]
Dump the countdown condition, if active.

Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd

10 years agoNew keycode definitions for HDMI-CEC
Jinsuk Kim [Wed, 14 May 2014 06:33:43 +0000 (15:33 +0900)]
New keycode definitions for HDMI-CEC

Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Also updated the information on the key code update by removing
some files not present any more.

Change-Id: I305d9b578c1824f34c457144a68132717dc9a97f

10 years agoFix infinite loop in TrustManagerService exception handler.
Jim Miller [Tue, 20 May 2014 00:38:13 +0000 (17:38 -0700)]
Fix infinite loop in TrustManagerService exception handler.

Fixes bug 15092272

Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1

10 years agoMerge "Fix password obscuring in TextView accessibility node"
Alan Viverette [Mon, 19 May 2014 23:56:06 +0000 (23:56 +0000)]
Merge "Fix password obscuring in TextView accessibility node"

10 years agoMerge "Rehide status bar signal problem colors on user builds."
John Spurlock [Mon, 19 May 2014 23:55:17 +0000 (23:55 +0000)]
Merge "Rehide status bar signal problem colors on user builds."

10 years agoRehide status bar signal problem colors on user builds.
John Spurlock [Mon, 19 May 2014 23:52:07 +0000 (19:52 -0400)]
Rehide status bar signal problem colors on user builds.

Bug:15089446
Change-Id: I322156a49e3117c38de2d2c5ba3223cea03abfff

10 years agoMerge "TouchFeedbackDrawable is now RippleDrawable"
Alan Viverette [Mon, 19 May 2014 23:51:30 +0000 (23:51 +0000)]
Merge "TouchFeedbackDrawable is now RippleDrawable"

10 years agoTouchFeedbackDrawable is now RippleDrawable
Alan Viverette [Mon, 19 May 2014 22:46:17 +0000 (15:46 -0700)]
TouchFeedbackDrawable is now RippleDrawable

Change-Id: I59f5f04b73089215c6320560556ac21beb03db06

10 years agoMerge "fix argument order in call to SkBlurDrawLooper constructor"
Victoria Lease [Mon, 19 May 2014 23:16:49 +0000 (23:16 +0000)]
Merge "fix argument order in call to SkBlurDrawLooper constructor"

10 years agofix argument order in call to SkBlurDrawLooper constructor
Victoria Lease [Mon, 19 May 2014 23:00:17 +0000 (16:00 -0700)]
fix argument order in call to SkBlurDrawLooper constructor

This fixes all sorts of badness.

Bug: 15074512
Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1

10 years agoFix password obscuring in TextView accessibility node
Alan Viverette [Mon, 19 May 2014 23:04:40 +0000 (16:04 -0700)]
Fix password obscuring in TextView accessibility node

BUG: 14998638
Change-Id: I215ea7b11bef5242e6adb1e595df36555548c165

10 years agoMerge "Add HEVC decoder support ot MediaCodec bug: 14571712"
Rachad [Mon, 19 May 2014 23:00:29 +0000 (23:00 +0000)]
Merge "Add HEVC decoder support ot MediaCodec bug: 14571712"

10 years agoAPI Review: split out BidirectionalTypeConverter.
George Mount [Mon, 19 May 2014 22:49:29 +0000 (15:49 -0700)]
API Review: split out BidirectionalTypeConverter.

Bug 14997858

Change-Id: I1f2ccf7c4e60320c8df759702a8f2fa24fd3acd2

10 years agoMerge "Removing versionCode"
ztenghui [Mon, 19 May 2014 22:43:32 +0000 (22:43 +0000)]
Merge "Removing versionCode"

10 years agoImplement onPeriodChanged and multiple scans of same channels
Vinit Deshpande [Mon, 19 May 2014 22:24:18 +0000 (15:24 -0700)]
Implement onPeriodChanged and multiple scans of same channels

This change fixes multiple scans of same channels; and it generates
onPeriodChanged event.

cherry-picked from partner:klp-wireless-dev
SHA1 950564a305865cc0ae2bc528479ea6922efbb898

Bug: 15000051
Change-Id: I06a4ecc9d45eda4984de50b97b39f623dd0b26d1

10 years agoRemoving versionCode
ztenghui [Mon, 19 May 2014 22:29:07 +0000 (15:29 -0700)]
Removing versionCode

Change-Id: I4b768d591208d10a5ae9b23a845102398eac20b6

10 years agoBaby steps
John Reck [Mon, 19 May 2014 17:28:35 +0000 (10:28 -0700)]
Baby steps

 Run ViewPropertyAnimators with no listeners on the RenderThread

Change-Id: I7ff5300db96c7f4b59b09e3fff8a0df173f132dd

10 years agoMerge "Remove the versionCode"
ztenghui [Mon, 19 May 2014 22:13:36 +0000 (22:13 +0000)]
Merge "Remove the versionCode"

10 years agoMerge "Cleaned up CanvasCompare tests."
Chris Craik [Mon, 19 May 2014 21:54:17 +0000 (21:54 +0000)]
Merge "Cleaned up CanvasCompare tests."

10 years agoMerge "Correct viewport initialization, bounds comparison"
Chris Craik [Mon, 19 May 2014 21:54:03 +0000 (21:54 +0000)]
Merge "Correct viewport initialization, bounds comparison"

10 years agoMerge "Using new APIs for handling system bar insets."
Winson Chung [Mon, 19 May 2014 21:53:36 +0000 (21:53 +0000)]
Merge "Using new APIs for handling system bar insets."

10 years agoUsing new APIs for handling system bar insets.
Winson Chung [Mon, 19 May 2014 21:49:42 +0000 (14:49 -0700)]
Using new APIs for handling system bar insets.

10 years agoMerge "Move background from notification into a view."
Jorim Jaggi [Mon, 19 May 2014 21:13:36 +0000 (21:13 +0000)]
Merge "Move background from notification into a view."

10 years agoMerge "Fixing regression in dismissing Recents."
Winson Chung [Mon, 19 May 2014 21:13:13 +0000 (21:13 +0000)]
Merge "Fixing regression in dismissing Recents."

10 years agoMove background from notification into a view.
Jorim Jaggi [Mon, 19 May 2014 18:26:46 +0000 (20:26 +0200)]
Move background from notification into a view.

This allows to run a circular clip animation for the double-tap
interaction on the lockscreen.

Change-Id: I1c36f4d250c0255fc1fd89f97f078b3f5914ee47

10 years agoam 9d1c3814: am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play...
quddusc [Mon, 19 May 2014 21:06:53 +0000 (21:06 +0000)]
am 9d1c3814: am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs

* commit '9d1c38144683f61a01c445ba4e8ce921a82f697f':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).

10 years agoam 11f06976: am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc...
Quddus Chong [Mon, 19 May 2014 21:06:48 +0000 (21:06 +0000)]
am 11f06976: am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs

* commit '11f069764bff452e2fac51765560e12d1017d516':
  docs: Updated Javadoc for GMS Kenafa release.

10 years agoFixing regression in dismissing Recents.
Winson Chung [Mon, 19 May 2014 17:30:43 +0000 (10:30 -0700)]
Fixing regression in dismissing Recents.

- Restoring app info functionality when developer options are enabled and you long-press on the app icon.

Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834

10 years agoam 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services...
quddusc [Mon, 19 May 2014 21:03:02 +0000 (21:03 +0000)]
am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs

* commit '9e58b46b566e2b1963ea1e42a9696a32784859f4':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).

10 years agoam 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa...
Quddus Chong [Mon, 19 May 2014 21:02:57 +0000 (21:02 +0000)]
am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs

* commit '4b2b91d47c1430f3c69893466cf2b8b025876888':
  docs: Updated Javadoc for GMS Kenafa release.

10 years agoam f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and...
quddusc [Mon, 19 May 2014 20:58:49 +0000 (20:58 +0000)]
am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs

* commit 'f269e732bf76d7dc4b37f2ce023684b4fe691c60':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).

10 years agoam 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into...
Quddus Chong [Mon, 19 May 2014 20:58:41 +0000 (20:58 +0000)]
am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs

* commit '4706479326789b4b20cc370cdb28c7a0b4f09646':
  docs: Updated Javadoc for GMS Kenafa release.

10 years agoam 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages...
quddusc [Mon, 19 May 2014 20:55:35 +0000 (20:55 +0000)]
am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs

* commit '728dbf8cc8d6c8a84bf67b8b34295eab4503d230':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).

10 years agoam f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
Quddus Chong [Mon, 19 May 2014 20:55:31 +0000 (20:55 +0000)]
am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs

* commit 'f4b6449515f212642e90e435b2a3a55766a41f9e':
  docs: Updated Javadoc for GMS Kenafa release.

10 years agoMerge "docs: Updated Google Play Services highlights and landing pages for Kenafa...
quddusc [Mon, 19 May 2014 20:52:05 +0000 (20:52 +0000)]
Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs

10 years agoMerge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
Quddus Chong [Mon, 19 May 2014 20:51:39 +0000 (20:51 +0000)]
Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs

10 years agoam 5a932046: am 6a7843c9: Merge "Override windowContentOverlay and windowBackground...
Mark Renouf [Mon, 19 May 2014 20:44:31 +0000 (20:44 +0000)]
am 5a932046: am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev

* commit '5a93204678f5032e3464cc36e38a805aabdeec95':
  Override windowContentOverlay and windowBackground for Theme.Micro.*

10 years agoam 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme...
Mark Renouf [Mon, 19 May 2014 20:40:51 +0000 (20:40 +0000)]
am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev

* commit '6a7843c972122bd90819fe991cb463088f19be0a':
  Override windowContentOverlay and windowBackground for Theme.Micro.*

10 years agoMerge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into...
Mark Renouf [Mon, 19 May 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev

10 years agoRemove the versionCode
ztenghui [Mon, 19 May 2014 16:27:26 +0000 (09:27 -0700)]
Remove the versionCode

Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75

10 years agoMerge "Workaround double-translate bug"
John Reck [Mon, 19 May 2014 20:21:00 +0000 (20:21 +0000)]
Merge "Workaround double-translate bug"

10 years agoWorkaround double-translate bug
John Reck [Mon, 19 May 2014 20:19:07 +0000 (13:19 -0700)]
Workaround double-translate bug

 Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0

10 years agoMerge "Fixed overScroll bugs in new notification shade."
Selim Cinek [Mon, 19 May 2014 19:57:09 +0000 (19:57 +0000)]
Merge "Fixed overScroll bugs in new notification shade."

10 years agoFixed overScroll bugs in new notification shade.
Selim Cinek [Mon, 19 May 2014 16:16:14 +0000 (18:16 +0200)]
Fixed overScroll bugs in new notification shade.

In certain situations the overscroll did not work, this is now fixed.
Also sometimes the overscroll could jump when flinging and we are
already overscrolled.

Change-Id: I20741f5c88028bf7b63c3db86266f8a68341fa62

10 years agoam 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in...
Chris Craik [Mon, 19 May 2014 19:35:59 +0000 (19:35 +0000)]
am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

* commit '3c769ec02b8b82bec4dec2169bf76af58be94a9a':
  Use alpha channel instead of red in drawCachedGlyphBitmap

10 years agoam 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphB...
Chris Craik [Mon, 19 May 2014 19:32:38 +0000 (19:32 +0000)]
am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

* commit '00fabcbeb035fb513293ea01d245002f40b3234f':
  Use alpha channel instead of red in drawCachedGlyphBitmap

10 years agoMerge "Speed up brightness transition if auto brightness adjustment is changed"
Adrian Roos [Mon, 19 May 2014 19:30:14 +0000 (19:30 +0000)]
Merge "Speed up brightness transition if auto brightness adjustment is changed"

10 years agoMerge "Rename session classes to have media prefix, hide routes"
RoboErik [Mon, 19 May 2014 19:29:05 +0000 (19:29 +0000)]
Merge "Rename session classes to have media prefix, hide routes"

10 years agoMerge "Move media key processing to sessions"
RoboErik [Mon, 19 May 2014 19:28:54 +0000 (19:28 +0000)]
Merge "Move media key processing to sessions"

10 years agoam b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
Chris Craik [Mon, 19 May 2014 19:27:52 +0000 (19:27 +0000)]
am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

* commit 'b1708e9b764268a06d91219a5c39ee9efd32ab00':
  Use alpha channel instead of red in drawCachedGlyphBitmap

10 years agoMerge "Use alpha channel instead of red in drawCachedGlyphBitmap"
Chris Craik [Mon, 19 May 2014 19:23:07 +0000 (19:23 +0000)]
Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

10 years agoUpdate FingerprintManager API after discussions.
Jim Miller [Wed, 14 May 2014 23:30:38 +0000 (16:30 -0700)]
Update FingerprintManager API after discussions.

Change-Id: I4d0b5ffc4d572f50961354ac37844c3cca7e5217

10 years agoOverride windowContentOverlay and windowBackground for Theme.Micro.*
Mark Renouf [Mon, 19 May 2014 17:40:17 +0000 (13:40 -0400)]
Override windowContentOverlay and windowBackground for Theme.Micro.*

Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84

10 years agoFix Keyguard PIN error message for N < 4.
Jim Miller [Mon, 19 May 2014 18:28:32 +0000 (11:28 -0700)]
Fix Keyguard PIN  error message for N < 4.

This fixes a bug where no error message was shown
when the user enters less than 4 digits for a PIN.

Fixes bug 14658301

Change-Id: Ia36ad205d197f0eb5f5095d71bc239ec7ded85f2

10 years agoam dc0c52f4: am 7099995b: am a84d24c3: Merge "Extend support for nordic languages...
Michael Wright [Mon, 19 May 2014 18:28:40 +0000 (18:28 +0000)]
am dc0c52f4: am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"

* commit 'dc0c52f4f592f6b9731939f0031e977a70515d4a':
  Extend support for nordic languages with Sami

10 years agoam 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"
Michael Wright [Mon, 19 May 2014 18:23:50 +0000 (18:23 +0000)]
am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"

* commit '7099995be5bfadcb03973d4ae952fd345bae264b':
  Extend support for nordic languages with Sami

10 years agoam f0029f64: am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear...
Dirk Dougherty [Mon, 19 May 2014 18:23:44 +0000 (18:23 +0000)]
am f0029f64: am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs

* commit 'f0029f644aa9d52e6fc1ebca8bea86cd67742c0a':
  Remove neg margin in wear css to resolve layout issue.

10 years agoam 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language...
Scott Rowe [Mon, 19 May 2014 18:23:40 +0000 (18:23 +0000)]
am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link

* commit '7a940a49745f51425e60bfde38b8c0dab454ef8b':
  docs: b/14510382 ISO language code, add link

10 years agoam a84d24c3: Merge "Extend support for nordic languages with Sami"
Michael Wright [Mon, 19 May 2014 18:19:20 +0000 (18:19 +0000)]
am a84d24c3: Merge "Extend support for nordic languages with Sami"

* commit 'a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
  Extend support for nordic languages with Sami

10 years agoMerge "Extend support for nordic languages with Sami"
Michael Wright [Mon, 19 May 2014 18:15:38 +0000 (18:15 +0000)]
Merge "Extend support for nordic languages with Sami"

10 years agoam 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolv...
Dirk Dougherty [Mon, 19 May 2014 18:12:40 +0000 (18:12 +0000)]
am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs

* commit '94fb04547ca35c09409cfc6e3b930805acddc7d6':
  Remove neg margin in wear css to resolve layout issue.