OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 894cff7c: am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev
John Spurlock [Tue, 12 May 2015 20:21:19 +0000 (20:21 +0000)]
am 894cff7c: am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev

* commit '894cff7cc26904b8f874352c4d623e46b4b4682d':
  DNDTile: Notify of value changes.

9 years agoam e39a2190: am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 20:21:13 +0000 (20:21 +0000)]
am e39a2190: am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

* commit 'e39a21908261d4e3c6d71a9525f453444f6cc76a':
  Flatten KeyStoreKeyProperties constants.

9 years agoam 571a7cef: am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev
John Spurlock [Tue, 12 May 2015 20:21:07 +0000 (20:21 +0000)]
am 571a7cef: am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev

* commit '571a7cef900cc897150a86702132cf85e6047ab7':
  Zen: Ringer mode integration fixes.

9 years agoam e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev
John Spurlock [Tue, 12 May 2015 20:09:40 +0000 (20:09 +0000)]
am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev

* commit 'e12931f6a5daf0f740f249aec8c3bab948b367f0':
  DNDTile: Notify of value changes.

9 years agoam c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 20:09:36 +0000 (20:09 +0000)]
am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

* commit 'c5a142f82b85aef4d740af4e8fefedf1cd0333fe':
  Flatten KeyStoreKeyProperties constants.

9 years agoam e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev
John Spurlock [Tue, 12 May 2015 20:09:32 +0000 (20:09 +0000)]
am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev

* commit 'e66ba4736667afb9ff3b1d3ebc487d024531f2a3':
  Zen: Ringer mode integration fixes.

9 years agoam ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default...
Chris Craik [Tue, 12 May 2015 20:01:03 +0000 (20:01 +0000)]
am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

* commit 'ca0790cdcdd95028f3e34c72a64b14658250fe7f':
  Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

9 years agoMerge "DNDTile: Notify of value changes." into mnc-dev
John Spurlock [Tue, 12 May 2015 19:58:48 +0000 (19:58 +0000)]
Merge "DNDTile: Notify of value changes." into mnc-dev

9 years agoMerge "Flatten KeyStoreKeyProperties constants." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 19:57:09 +0000 (19:57 +0000)]
Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

9 years agoMerge "Zen: Ringer mode integration fixes." into mnc-dev
John Spurlock [Tue, 12 May 2015 19:54:47 +0000 (19:54 +0000)]
Merge "Zen: Ringer mode integration fixes." into mnc-dev

9 years agoFlatten KeyStoreKeyProperties constants.
Alex Klyubin [Tue, 12 May 2015 19:53:23 +0000 (12:53 -0700)]
Flatten KeyStoreKeyProperties constants.

This moves constants/flags declared in inner classes of
KeyStoreKeyProperties into KeyStoreKeyProperties, as requested by API
Council.

Bug: 21039983
Change-Id: I84a3c983e13644a027bed9f605ab8044220a352c

9 years agoDNDTile: Notify of value changes.
John Spurlock [Tue, 12 May 2015 19:52:38 +0000 (15:52 -0400)]
DNDTile: Notify of value changes.

Bug: 21055789
Change-Id: If9008b13a6a5583832fc4dfaa8ec3e21b61cb25c

9 years agoam 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to...
Chris Craik [Tue, 12 May 2015 19:48:17 +0000 (19:48 +0000)]
am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

* commit '6af2857ae0c3bde47e0e4a6abd84f42ee7086291':
  Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

9 years agoMerge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasi...
Chris Craik [Tue, 12 May 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

9 years agoam c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager....
Yohei Yukawa [Tue, 12 May 2015 19:36:44 +0000 (19:36 +0000)]
am c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

* commit 'c1f055a809c27f2e512029dc5623c4405eddb9b3':
  Remove obsolete fields from InputMethodManager.

9 years agoam f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
Yohei Yukawa [Tue, 12 May 2015 19:27:59 +0000 (19:27 +0000)]
am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

* commit 'f038295e98846e3e359854b1642b362643bd6053':
  Remove obsolete fields from InputMethodManager.

9 years agoMerge "Remove obsolete fields from InputMethodManager." into mnc-dev
Yohei Yukawa [Tue, 12 May 2015 19:16:30 +0000 (19:16 +0000)]
Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

9 years agoam 81246cec: am dbd90f03: Merge "Tests for Notification object construction and parce...
Dan Sandler [Tue, 12 May 2015 19:14:46 +0000 (19:14 +0000)]
am 81246cec: am dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev

* commit '81246cec2d631faa08089c158f8fa6a3bfd517b2':
  Tests for Notification object construction and parceling.

9 years agoam dbd90f03: Merge "Tests for Notification object construction and parceling." into...
Dan Sandler [Tue, 12 May 2015 18:57:59 +0000 (18:57 +0000)]
am dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev

* commit 'dbd90f032971d59bfb8e0fd2964a3ecb0a9843bd':
  Tests for Notification object construction and parceling.

9 years agoam a89893fc: am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev
Jason Monk [Tue, 12 May 2015 18:57:54 +0000 (18:57 +0000)]
am a89893fc: am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev

* commit 'a89893fc60161ff75d862c9e6bbc34665edb6aa4':
  Fix crash in setup wizard

9 years agoMerge "Tests for Notification object construction and parceling." into mnc-dev
Dan Sandler [Tue, 12 May 2015 18:51:02 +0000 (18:51 +0000)]
Merge "Tests for Notification object construction and parceling." into mnc-dev

9 years agoam ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev
Jason Monk [Tue, 12 May 2015 18:47:28 +0000 (18:47 +0000)]
am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev

* commit 'ba6a72fd668c5396e2dc903806c915233bed43c7':
  Fix crash in setup wizard

9 years agoZen: Ringer mode integration fixes.
John Spurlock [Mon, 11 May 2015 20:00:09 +0000 (16:00 -0400)]
Zen: Ringer mode integration fixes.

 - Properly mute media + alarm streams in total silence.
 - Allow system components to update the "ringer mode affected"
   streams dynamically.
 - Improve dumpsys output for ringer mode streams (include names).
 - Remember last ringer mode properly when entering dnd via a
   volume down (so we can restore it properly when exiting).

Bug: 20854925
Bug: 20950463
Bug: 20756527
Change-Id: I80afc1f639ff802c541020e25ade1b23e9997ef9

9 years agoMerge "Fix crash in setup wizard" into mnc-dev
Jason Monk [Tue, 12 May 2015 18:37:23 +0000 (18:37 +0000)]
Merge "Fix crash in setup wizard" into mnc-dev

9 years agoFix crash in setup wizard
Jason Monk [Tue, 12 May 2015 18:20:25 +0000 (14:20 -0400)]
Fix crash in setup wizard

Clear out any unhandled worker messages before stopping tracking.

Bug: 21048197
Change-Id: I3792215a1e7799bdb93587cd7158c4d5d86de348

9 years agoRemove obsolete fields from InputMethodManager.
Yohei Yukawa [Tue, 12 May 2015 18:11:27 +0000 (11:11 -0700)]
Remove obsolete fields from InputMethodManager.

IMM#mViewTopLeft and IMM#mViewToScreenMatrix are no longer used.
They should have not been removed in
I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef.

Change-Id: Ia685956c8f7dda1143135345ee9a3873705975ef

9 years agoam 3851b473: am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge...
Rich Slogar [Tue, 12 May 2015 18:06:03 +0000 (18:06 +0000)]
am 3851b473: am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '3851b473c0784129bddc0ecc0822f8fa8bbf6235':
  docs: renderscript using gradle settings

9 years agoam b5e56d8e: am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into...
Wei Jia [Tue, 12 May 2015 18:01:50 +0000 (18:01 +0000)]
am b5e56d8e: am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

* commit 'b5e56d8e86cce218c531ac421442d7523a38cc46':
  MediaSync: rename bufferIndex to bufferId.

9 years agoam dc797d5b: am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 18:01:44 +0000 (18:01 +0000)]
am dc797d5b: am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev

* commit 'dc797d5b5c3e61784a3667eeff6b6d91af4ffb67':
  Change attribute values per API council.

9 years agoam eadffbc6: am 2a857f00: Merge "Move visibleBehind activities into stop state when...
Wale Ogunwale [Tue, 12 May 2015 18:01:39 +0000 (18:01 +0000)]
am eadffbc6: am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

* commit 'eadffbc6fb378bf634dcbbb911d38d3ae43bd006':
  Move visibleBehind activities into stop state when sleeping/powerDown

9 years agoam d9a87d7c: am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev
P.Y. Laligand [Tue, 12 May 2015 18:01:30 +0000 (18:01 +0000)]
am d9a87d7c: am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev

* commit 'd9a87d7c748bc2c396df45aba656e30f134e3154':
  DO NOT MERGE - Display mode switches.

9 years agoam 160f120c: am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev
Doris Liu [Tue, 12 May 2015 18:01:25 +0000 (18:01 +0000)]
am 160f120c: am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev

* commit '160f120c0b9b8a43b6d4a667a298353720b41bae':
  Avoid setting mCurFrame to -1

9 years agoam 2fa064d7: am 03064e25: Merge "Link to magic constants used by AndroidKeyStore...
Alex Klyubin [Tue, 12 May 2015 18:01:20 +0000 (18:01 +0000)]
am 2fa064d7: am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '2fa064d7e209bc9d75ab86eb4b16db8a56dc299e':
  Link to magic constants used by AndroidKeyStore API.

9 years agoam 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renders...
Rich Slogar [Tue, 12 May 2015 17:59:51 +0000 (17:59 +0000)]
am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '389d5ac6ac974f171c12eb608eb8a3e2cad120f8':
  docs: renderscript using gradle settings

9 years agoam d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
Christopher Tate [Tue, 12 May 2015 17:49:26 +0000 (17:49 +0000)]
am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

* commit 'd990e4118a1688847e6fba2f9fcf1ed4532a6f46':
  Deprecate Context.MODE_MULTI_PROCESS

9 years agoam db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor...
Chris Craik [Tue, 12 May 2015 17:49:22 +0000 (17:49 +0000)]
am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit 'db05ea901041258a64477c51456c9092a826d0cf':
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

9 years agoam 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using...
Rich Slogar [Tue, 12 May 2015 17:48:30 +0000 (17:48 +0000)]
am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '353232ecee06d1828d8628c4e3917e3b428485aa':
  docs: renderscript using gradle settings

9 years agoam 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev
Wei Jia [Tue, 12 May 2015 17:47:38 +0000 (17:47 +0000)]
am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

* commit '0cd3881aafe40a191db1bd6ff1e1723f25bbb6b0':
  MediaSync: rename bufferIndex to bufferId.

9 years agoam e0b2cad0: Merge "Change attribute values per API council." into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 17:47:30 +0000 (17:47 +0000)]
am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev

* commit 'e0b2cad093760478e59a4aee5a7af43af2789db6':
  Change attribute values per API council.

9 years agoam 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/power...
Wale Ogunwale [Tue, 12 May 2015 17:47:25 +0000 (17:47 +0000)]
am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

* commit '2a857f00110c448d702ffa4ee998dfd78688fa21':
  Move visibleBehind activities into stop state when sleeping/powerDown

9 years agoam e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev
P.Y. Laligand [Tue, 12 May 2015 17:47:21 +0000 (17:47 +0000)]
am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev

* commit 'e6c47686f62643d3399218eef4728c22358cbcfb':
  DO NOT MERGE - Display mode switches.

9 years agoam 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev
Doris Liu [Tue, 12 May 2015 17:47:17 +0000 (17:47 +0000)]
am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev

* commit '4b403557bca7b622c187c3b06814e2118ec7d985':
  Avoid setting mCurFrame to -1

9 years agoam 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:47:12 +0000 (17:47 +0000)]
am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '03064e25b284d7ee99563658c5966ee590f925f6':
  Link to magic constants used by AndroidKeyStore API.

9 years agoRevert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
Chris Craik [Tue, 12 May 2015 17:28:14 +0000 (10:28 -0700)]
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

Fix import

This reverts commit 7ed1431c83286abc83b9e5afc45fbd21ecb777b1.

Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b

9 years agoMerge "MediaSync: rename bufferIndex to bufferId." into mnc-dev
Wei Jia [Tue, 12 May 2015 17:43:46 +0000 (17:43 +0000)]
Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

9 years agoMerge "Change attribute values per API council." into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 17:43:02 +0000 (17:43 +0000)]
Merge "Change attribute values per API council." into mnc-dev

9 years agoMerge "Move visibleBehind activities into stop state when sleeping/powerDown" into...
Wale Ogunwale [Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)]
Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

9 years agoMerge "DO NOT MERGE - Display mode switches." into mnc-dev
P.Y. Laligand [Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)]
Merge "DO NOT MERGE - Display mode switches." into mnc-dev

9 years agoMediaSync: rename bufferIndex to bufferId.
Wei Jia [Tue, 12 May 2015 00:34:46 +0000 (17:34 -0700)]
MediaSync: rename bufferIndex to bufferId.

Bug: 20887706
Change-Id: I98887832bc2211614a19a3718b46d6da100f6c9b

9 years agoam b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle setting...
Rich Slogar [Tue, 12 May 2015 17:36:17 +0000 (17:36 +0000)]
am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit 'b97afd418558fbe5cf37a17302a84a9d907490e6':
  docs: renderscript using gradle settings

9 years agoam 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
Christopher Tate [Tue, 12 May 2015 17:33:07 +0000 (17:33 +0000)]
am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

* commit '54415439ca8d286c4efaf975a54fe0cc7872c86b':
  Deprecate Context.MODE_MULTI_PROCESS

9 years agoam 797fe04b: am 15a7bb20: Merge "Move PointFormat constants into parent class." into...
Alex Klyubin [Tue, 12 May 2015 17:33:05 +0000 (17:33 +0000)]
am 797fe04b: am 15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev

* commit '797fe04b6baa62d454d33a732f2be838b0f2ed07':
  Move PointFormat constants into parent class.

9 years agoam d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti...
Chris Craik [Tue, 12 May 2015 17:33:03 +0000 (17:33 +0000)]
am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit 'd2c05188b669256ab9d6024ad5793e0ca891fed0':
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

9 years agoam f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing...
Chris Craik [Tue, 12 May 2015 17:33:00 +0000 (17:33 +0000)]
am f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev

* commit 'f3aad32205f3e4acdfe092a78819cacdfec54f91':
  Revert "Use default constructor to get anti-aliasing"

9 years agoMerge "Avoid setting mCurFrame to -1" into mnc-dev
Doris Liu [Tue, 12 May 2015 17:32:21 +0000 (17:32 +0000)]
Merge "Avoid setting mCurFrame to -1" into mnc-dev

9 years agoMerge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:32:29 +0000 (17:32 +0000)]
Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

9 years agoMerge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
Christopher Tate [Tue, 12 May 2015 17:28:12 +0000 (17:28 +0000)]
Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

9 years agoChange attribute values per API council.
Craig Mautner [Tue, 28 Apr 2015 23:21:06 +0000 (16:21 -0700)]
Change attribute values per API council.

lockTaskModeDefault => default
lockTaskModeNever => never
lockTaskModeIfWhitelisted => if_whitelisted
lockTaskModeAlways => always

Fixes bug 20642190.

Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4

9 years agoMerge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"...
Chris Craik [Tue, 12 May 2015 17:22:33 +0000 (17:22 +0000)]
Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

9 years agoFix build - Revert "Revert "Use default constructor to get anti-aliasing""
Chris Craik [Tue, 12 May 2015 17:22:22 +0000 (17:22 +0000)]
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

This reverts commit dfe0a66ceca530e0777ebfab20f81103baa18f14.

Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a

9 years agoam a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp...
Rich Slogar [Tue, 12 May 2015 17:20:10 +0000 (17:20 +0000)]
am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit 'a27dd186b265b58eae490d4e19ec11268ea54f12':
  docs: renderscript using gradle settings

9 years agoam 15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:18:59 +0000 (17:18 +0000)]
am 15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev

* commit '15a7bb202d06bf73f4783d3aaa3d284ba84e08d1':
  Move PointFormat constants into parent class.

9 years agoam fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
Chris Craik [Tue, 12 May 2015 17:18:55 +0000 (17:18 +0000)]
am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev

* commit 'fd41cf0cfc3d460606fbc176703e97fd8346a868':
  Revert "Use default constructor to get anti-aliasing"

9 years agoam eff9e253: am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidK...
Alex Klyubin [Tue, 12 May 2015 17:16:14 +0000 (17:16 +0000)]
am eff9e253: am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

* commit 'eff9e25320bfe3375d565179db88a05f2a4ee6a9':
  Hide @IntDef and @StringDef annotations from AnroidKeyStore API.

9 years agoam 4b16f2cc: am 3d8c6781: Merge "Don\'t apply animation clip to dialog activities...
Olawale Ogunwale [Tue, 12 May 2015 17:16:09 +0000 (17:16 +0000)]
am 4b16f2cc: am 3d8c6781: Merge "Don\'t apply animation clip to dialog activities" into mnc-dev

* commit '4b16f2cc91feec208804ffb31b9e0adacafd3978':
  Don't apply animation clip to dialog activities

9 years agoMerge "Move PointFormat constants into parent class." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:12:18 +0000 (17:12 +0000)]
Merge "Move PointFormat constants into parent class." into mnc-dev

9 years agoMove PointFormat constants into parent class.
Alex Klyubin [Tue, 12 May 2015 17:05:53 +0000 (10:05 -0700)]
Move PointFormat constants into parent class.

This gets rid of EcIesParameterSpec.PointFormat by moving the
constants into EcIesParameterSpec, prefixed with POINT_FORMAT_.

Bug: 21039983
Change-Id: I7a76bb84e0394db9c7f5b0d53526915d5bbdd511

9 years agoAvoid setting mCurFrame to -1
Doris Liu [Mon, 11 May 2015 22:18:45 +0000 (15:18 -0700)]
Avoid setting mCurFrame to -1

Use the dedicated flag mRunning to check whether the DrawableAnimation
is running, rather than comparing mCurFrame with -1. This CL aims to
simplify the use of mCurFrame.

Bug: 17112962
Change-Id: I15f9e4c102f504b8c806f029949fe9ec872479a5

9 years agoMerge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
Chris Craik [Tue, 12 May 2015 17:07:24 +0000 (17:07 +0000)]
Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev

9 years agoam e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
Rich Slogar [Tue, 12 May 2015 17:05:40 +0000 (17:05 +0000)]
am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit 'e78f136b1dbe11dc98c5699da24df49fd9dae795':
  docs: renderscript using gradle settings

9 years agoam 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API...
Alex Klyubin [Tue, 12 May 2015 16:59:30 +0000 (16:59 +0000)]
am 56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

* commit '56b96da7e1f1825267662df762609c198a8c41d6':
  Hide @IntDef and @StringDef annotations from AnroidKeyStore API.

9 years agoam 3d8c6781: Merge "Don\'t apply animation clip to dialog activities" into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 16:59:25 +0000 (16:59 +0000)]
am 3d8c6781: Merge "Don\'t apply animation clip to dialog activities" into mnc-dev

* commit '3d8c678136ed34e2573a46123681e6a647e5537d':
  Don't apply animation clip to dialog activities

9 years agoMerge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 16:56:10 +0000 (16:56 +0000)]
Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

9 years agoMerge "docs: renderscript using gradle settings" into lmp-docs
Rich Slogar [Tue, 12 May 2015 16:54:37 +0000 (16:54 +0000)]
Merge "docs: renderscript using gradle settings" into lmp-docs

9 years agoam 5b45e95f: am dc9230b1: Merge "Shrink default path cache size" into mnc-dev
Chris Craik [Tue, 12 May 2015 16:53:19 +0000 (16:53 +0000)]
am 5b45e95f: am dc9230b1: Merge "Shrink default path cache size" into mnc-dev

* commit '5b45e95f965c4d87597cafafab67211c606c7296':
  Shrink default path cache size

9 years agoam 3ce689a4: am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid...
Paul Jensen [Tue, 12 May 2015 16:53:14 +0000 (16:53 +0000)]
am 3ce689a4: am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev

* commit '3ce689a4cdef8cc7f2be1bad001bb74a1d360909':
  Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.

9 years agoMerge "Don't apply animation clip to dialog activities" into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 16:51:02 +0000 (16:51 +0000)]
Merge "Don't apply animation clip to dialog activities" into mnc-dev

9 years agoam dc9230b1: Merge "Shrink default path cache size" into mnc-dev
Chris Craik [Tue, 12 May 2015 16:50:52 +0000 (16:50 +0000)]
am dc9230b1: Merge "Shrink default path cache size" into mnc-dev

* commit 'dc9230b14ed86f5f5bc3b745242d7521828a924e':
  Shrink default path cache size

9 years agoam 7c15032d: am c7374318: am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During...
Christopher Tate [Tue, 12 May 2015 16:44:29 +0000 (16:44 +0000)]
am 7c15032d: am c7374318: am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit '7c15032d8ab50a68936e42ae07f12b81ef702c0e':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoam 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneede...
Paul Jensen [Tue, 12 May 2015 16:41:50 +0000 (16:41 +0000)]
am 356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev

* commit '356a26122bf928709d88cdc9a4a304b4495b1b31':
  Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.

9 years agoMerge "Shrink default path cache size" into mnc-dev
Chris Craik [Tue, 12 May 2015 16:39:33 +0000 (16:39 +0000)]
Merge "Shrink default path cache size" into mnc-dev

9 years agoRevert "Use default constructor to get anti-aliasing"
Chris Craik [Tue, 12 May 2015 16:36:28 +0000 (16:36 +0000)]
Revert "Use default constructor to get anti-aliasing"

bug:20948129

This reverts commit 58fc522a69e8ddf9ac8530ce88e9c2c92da1dd14.

Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46

9 years agoMerge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
Paul Jensen [Tue, 12 May 2015 16:32:28 +0000 (16:32 +0000)]
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev

9 years agoHide @IntDef and @StringDef annotations from AnroidKeyStore API.
Alex Klyubin [Mon, 11 May 2015 19:48:27 +0000 (12:48 -0700)]
Hide @IntDef and @StringDef annotations from AnroidKeyStore API.

By convention, these annotation classes should remain hidden API.

Bug: 18088752
Bug: 21039983
Change-Id: Ifb5d2910c7dae4e0fd809876eb641f1aaf7a00a6

9 years agoam c7374318: am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot...
Christopher Tate [Tue, 12 May 2015 16:28:29 +0000 (16:28 +0000)]
am c7374318: am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit 'c7374318a69d4341235bd143b9fdae2cabcea3e9':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoam af78a8b6: am 14dcb5f1: Bluetooth native dumpsys logging support (3/5)
Andre Eisenbach [Tue, 12 May 2015 16:22:40 +0000 (16:22 +0000)]
am af78a8b6: am 14dcb5f1: Bluetooth native dumpsys logging support (3/5)

* commit 'af78a8b636c2f1afacea704dad851533435d989d':
  Bluetooth native dumpsys logging support (3/5)

9 years agoam 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CH...
Christopher Tate [Tue, 12 May 2015 16:17:47 +0000 (16:17 +0000)]
am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit '7a4cfa58b1421f95266acc4f6a1683804726a0e0':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoam 57887dc1: am bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into...
Chris Craik [Tue, 12 May 2015 16:11:43 +0000 (16:11 +0000)]
am 57887dc1: am bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev

* commit '57887dc11b4d8c4e67b9af3a1c4f5af65cdfffa7':
  Remove usage of Texture::cleanup in PathCache

9 years agoam 14dcb5f1: Bluetooth native dumpsys logging support (3/5)
Andre Eisenbach [Tue, 12 May 2015 16:11:26 +0000 (16:11 +0000)]
am 14dcb5f1: Bluetooth native dumpsys logging support (3/5)

* commit '14dcb5f13852619e68a22446ee37510191718c3a':
  Bluetooth native dumpsys logging support (3/5)

9 years agoam 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only...
Christopher Tate [Tue, 12 May 2015 16:06:43 +0000 (16:06 +0000)]
am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit '960cb4816c082eee52a221052a8e4232f0c0fb14':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoam bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
Chris Craik [Tue, 12 May 2015 15:57:43 +0000 (15:57 +0000)]
am bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev

* commit 'bf9c5c13cd24350e85f534d2348c1dd4ba8a33df':
  Remove usage of Texture::cleanup in PathCache

9 years agoBluetooth native dumpsys logging support (3/5)
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
Bluetooth native dumpsys logging support (3/5)

Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2

9 years agoam 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered...
Christopher Tate [Tue, 12 May 2015 15:53:04 +0000 (15:53 +0000)]
am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit '613626b7488c5c35a4816804fbe8f837a7e30440':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoMerge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
Chris Craik [Tue, 12 May 2015 15:48:54 +0000 (15:48 +0000)]
Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev

9 years agoam afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
Christopher Tate [Tue, 12 May 2015 15:39:12 +0000 (15:39 +0000)]
am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers

* commit 'afd883f8a3ee260a5505f83d628c0b789871c837':
  During early boot, send LOCALE_CHANGED only to registered receivers

9 years agoam bef59787: am e74d5d09: Merge "Add SysUI Tuner" into mnc-dev
Jason Monk [Tue, 12 May 2015 15:26:15 +0000 (15:26 +0000)]
am bef59787: am e74d5d09: Merge "Add SysUI Tuner" into mnc-dev

* commit 'bef59787eb7cde913faaf0f49e0a2ef5cb979704':
  Add SysUI Tuner

9 years agoam e74d5d09: Merge "Add SysUI Tuner" into mnc-dev
Jason Monk [Tue, 12 May 2015 15:14:30 +0000 (15:14 +0000)]
am e74d5d09: Merge "Add SysUI Tuner" into mnc-dev

* commit 'e74d5d09e1749b128437ff340b43278857139338':
  Add SysUI Tuner

9 years agoMerge "Add SysUI Tuner" into mnc-dev
Jason Monk [Tue, 12 May 2015 15:03:40 +0000 (15:03 +0000)]
Merge "Add SysUI Tuner" into mnc-dev

9 years agoAdd SysUI Tuner
Jason Monk [Mon, 11 May 2015 20:57:15 +0000 (16:57 -0400)]
Add SysUI Tuner

Change-Id: I9b0fabbe913b8297d8c668b6416a7be856adb9d5

9 years agoam deb356dd: am 2df11817: Merge "Add control for double tap to wake setting" into...
Jason Monk [Tue, 12 May 2015 14:57:22 +0000 (14:57 +0000)]
am deb356dd: am 2df11817: Merge "Add control for double tap to wake setting" into mnc-dev

* commit 'deb356ddc72ddff09f6ecdd19cb5c29d8fc7aee7':
  Add control for double tap to wake setting