OSDN Git Service

android-x86/frameworks-base.git
9 years agoam fa216411: Merge "Add CallbackRegistry." into mnc-dev
George Mount [Tue, 12 May 2015 21:39:52 +0000 (21:39 +0000)]
am fa216411: Merge "Add CallbackRegistry." into mnc-dev

* commit 'fa21641122170777818ff838c1c19505313e83c3':
  Add CallbackRegistry.

9 years agoam b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into...
George Mount [Tue, 12 May 2015 21:39:43 +0000 (21:39 +0000)]
am b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into mnc-dev

* commit 'b3ba21389553c79109a3d1415d78e8a582c6dcaa':
  Fix crash during Activity Transition with TextureView.

9 years agoam d6a21352: Remove FloatMath methods from the API
Neil Fuller [Tue, 12 May 2015 21:39:29 +0000 (21:39 +0000)]
am d6a21352: Remove FloatMath methods from the API

* commit 'd6a213526251896b7f9928334a17ae0dd97669ba':
  Remove FloatMath methods from the API

9 years agoam dbf62ace: Merge "Remove incomplete media router API." into mnc-dev
Jeff Brown [Tue, 12 May 2015 21:39:16 +0000 (21:39 +0000)]
am dbf62ace: Merge "Remove incomplete media router API." into mnc-dev

* commit 'dbf62ace0dcb671f5eaa97c0dfa75e39bc9c88be':
  Remove incomplete media router API.

9 years agoam dd0f3964: Merge "CEC: Make wakeup on hotplug optional" into mnc-dev
Jinsuk Kim [Tue, 12 May 2015 21:39:07 +0000 (21:39 +0000)]
am dd0f3964: Merge "CEC: Make wakeup on hotplug optional" into mnc-dev

* commit 'dd0f3964ef0bb6c04eb295119a2c7355125332d0':
  CEC: Make wakeup on hotplug optional

9 years agoam 38de061b: am b53420d0: am e7866887: docs: M Preview landing page
Joe Fernandez [Tue, 12 May 2015 21:38:58 +0000 (21:38 +0000)]
am 38de061b: am b53420d0: am e7866887: docs: M Preview landing page

* commit '38de061b8b3953f7c211e75b4f7a5e22bd41711a':
  docs: M Preview landing page

9 years agoam f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon...
Yohei Yukawa [Tue, 12 May 2015 21:38:47 +0000 (21:38 +0000)]
am f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev

* commit 'f2cac4d495a6365758a99f4eba531579ab73fee5':
  Retry "Always show auxiliary subtypes from NavBar keyboard icon."

9 years agoam bdfaa7f5: Bluetooth: Ensure Bluetooth interface handle is valid
Nitin Arora [Tue, 12 May 2015 21:38:39 +0000 (21:38 +0000)]
am bdfaa7f5: Bluetooth: Ensure Bluetooth interface handle is valid

* commit 'bdfaa7f566a0fbe59dfc6bc14cd9d4d92b9259fa':
  Bluetooth: Ensure Bluetooth interface handle is valid

9 years agoam 9132c5ab: Merge "Revert "Remove incomplete media router API."" into mnc-dev
Bart Sears [Tue, 12 May 2015 21:37:34 +0000 (21:37 +0000)]
am 9132c5ab: Merge "Revert "Remove incomplete media router API."" into mnc-dev

* commit '9132c5ab0746f56909ed5630a6e93c9fadefabd0':
  Revert "Remove incomplete media router API."

9 years agoam 70280a20: am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added functio...
Diego Perez [Tue, 12 May 2015 21:37:27 +0000 (21:37 +0000)]
am 70280a20: am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev

* commit '70280a20f379e416d9cff20b7c6764844e7c2ff4':
  Added function to render a drawable in all available states

9 years agoam 1290748d: Merge "Remove incomplete media router API." into mnc-dev
Jeff Brown [Tue, 12 May 2015 21:37:20 +0000 (21:37 +0000)]
am 1290748d: Merge "Remove incomplete media router API." into mnc-dev

* commit '1290748db311fb8cf9e5491e988c82b0757ec57e':
  Remove incomplete media router API.

9 years agoam 1b0888fe: Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon...
Bart Sears [Tue, 12 May 2015 21:37:10 +0000 (21:37 +0000)]
am 1b0888fe: Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev

* commit '1b0888fe8e70ddb92090edbaea545f2766ee404e':
  Revert "Always show auxiliary subtypes from NavBar keyboard icon."

9 years agoam ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev
Jeff Brown [Tue, 12 May 2015 21:36:59 +0000 (21:36 +0000)]
am ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev

* commit 'ee2e8fbe71444baac010d363cca9a113e12abdb6':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."

9 years agoam f7f6fd2c: am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09...
Diego Perez [Tue, 12 May 2015 21:36:45 +0000 (21:36 +0000)]
am f7f6fd2c: am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev

* commit 'f7f6fd2c0c1a185b658915e7e12fbd93560c7391':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.

9 years agoam c000db78: am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status...
Diego Perez [Tue, 12 May 2015 21:36:27 +0000 (21:36 +0000)]
am c000db78: am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev

* commit 'c000db78d7dabc244e9bda42d33977fc4d259b20':
  Make status and navigation bars widgets and usable from layouts

9 years agoam 9207b856: am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBa...
Diego Perez [Tue, 12 May 2015 21:36:20 +0000 (21:36 +0000)]
am 9207b856: am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev

* commit '9207b8567af2ea3913aec6085e8e610a70925e09':
  Move StatusBar to use statusBarColor theme attribute

9 years agoam c87fe129: am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure...
Diego Perez [Tue, 12 May 2015 21:36:02 +0000 (21:36 +0000)]
am c87fe129: am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev

* commit 'c87fe129e5ce33b03c570ce34184395a3011135c':
  Make sure shaders use a color model compatible with the destination.

9 years agoam 790f6925: am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutli...
Deepanshu Gupta [Tue, 12 May 2015 21:35:54 +0000 (21:35 +0000)]
am 790f6925: am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev

* commit '790f6925a7381f5a59623854fcbd04c84f529fd1':
  More layoutlib tests.

9 years agoam 2ab7b460: resolved conflicts for merge of a663e012 to mnc-dev
Deepanshu Gupta [Tue, 12 May 2015 21:35:46 +0000 (21:35 +0000)]
am 2ab7b460: resolved conflicts for merge of a663e012 to mnc-dev

* commit '2ab7b460562ca9cf52a5c47a9c61a5cc31fd3a13':
  RecyclerView in LayoutLib: better XML attrs.

9 years agoam d7a53dab: am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAp...
Diego Perez [Tue, 12 May 2015 21:35:37 +0000 (21:35 +0000)]
am d7a53dab: am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

* commit 'd7a53dab44babb38acc7cd0cc3067ae95152614d':
  Fix isThemeAppCompat NPE when using an invalid theme

9 years agoam 15432daa: am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annot...
Deepanshu Gupta [Tue, 12 May 2015 21:35:30 +0000 (21:35 +0000)]
am 15432daa: am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev

* commit '15432daa6e35d8978393da083f934848957f147c':
  Nullity annotations to some tests.

9 years agoam dbcedeea: am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title...
Deepanshu Gupta [Tue, 12 May 2015 21:35:23 +0000 (21:35 +0000)]
am dbcedeea: am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev

* commit 'dbcedeea2031554d5ebf9b3c09df90374b3273a7':
  Fix title bar showing when not required.

9 years agoam c49b8f9d: am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib...
Deepanshu Gupta [Tue, 12 May 2015 21:35:16 +0000 (21:35 +0000)]
am c49b8f9d: am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev

* commit 'c49b8f9d1b00e89e24f598eaeab6f7395fc68f32':
  LayoutLib: fix crash when shadow size <=0.

9 years agoam 90ae4553: Merge "Move PhoneWindow and friends back into internal package" into...
Adam Powell [Tue, 12 May 2015 21:35:05 +0000 (21:35 +0000)]
am 90ae4553: Merge "Move PhoneWindow and friends back into internal package" into mnc-dev

* commit '90ae4553fe8649f248351dd39bb77b1c46a7ebae':
  Move PhoneWindow and friends back into internal package

9 years agoam 7afd01e2: Merge "Do nothing if hideSoftInput is called from not focused client...
Seigo Nonaka [Tue, 12 May 2015 21:34:33 +0000 (21:34 +0000)]
am 7afd01e2: Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev

* commit '7afd01e2f1c0235f5d5a95744200d6739d6fcaa4':
  Do nothing if hideSoftInput is called from not focused client.

9 years agoam c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev
John Spurlock [Tue, 12 May 2015 21:33:58 +0000 (21:33 +0000)]
am c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev

* commit 'c2ec334079375ac6a4337bd5b94e173534b51129':
  Add setting to mute wireless charging sound.

9 years agoam 9a7db1a6: Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev
Yorke Lee [Tue, 12 May 2015 21:33:23 +0000 (21:33 +0000)]
am 9a7db1a6: Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev

* commit '9a7db1a6f58a3efc37c7e761445617f22adb9d4e':
  Fix potential NPE in TelecomManager.placeCall

9 years agoam 2665fdfd: Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev
Nicolas Prevot [Tue, 12 May 2015 21:32:59 +0000 (21:32 +0000)]
am 2665fdfd: Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev

* commit '2665fdfd61abce66a4843436333d5471cf389753':
  Fetch DISALLOW_CONFIG_VPN for the current user.

9 years agoam 4862e973: Merge "Annotate Application with @CallSuper" into mnc-dev
John Reck [Tue, 12 May 2015 21:32:50 +0000 (21:32 +0000)]
am 4862e973: Merge "Annotate Application with @CallSuper" into mnc-dev

* commit '4862e973a643a0f66da50ce416258c62d7c55e2d':
  Annotate Application with @CallSuper

9 years agoam e184a6b9: Merge "CEC: Reset active source/path before going into standby" into...
Jinsuk Kim [Tue, 12 May 2015 21:32:42 +0000 (21:32 +0000)]
am e184a6b9: Merge "CEC: Reset active source/path before going into standby" into mnc-dev

* commit 'e184a6b9ac6d2f871bc094665bef5efa7f2292e5':
  CEC: Reset active source/path before going into standby

9 years agoam 41fe5292: Merge "Delay all syncing until the device is provisioned" into mnc-dev
Matthew Williams [Tue, 12 May 2015 21:32:20 +0000 (21:32 +0000)]
am 41fe5292: Merge "Delay all syncing until the device is provisioned" into mnc-dev

* commit '41fe5292fdf692ffba5b80e984113d431ce7d2fd':
  Delay all syncing until the device is provisioned

9 years agoam 6402dc7e: Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev
Raph Levien [Tue, 12 May 2015 21:31:57 +0000 (21:31 +0000)]
am 6402dc7e: Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev

* commit '6402dc7e4adbfb64ee80858292958ed217560c12':
  Clear all StaticLayout.Builder fields on pool recycle

9 years agoam 03dbaf15: Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev
John Spurlock [Tue, 12 May 2015 21:31:39 +0000 (21:31 +0000)]
am 03dbaf15: Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev

* commit '03dbaf15ee466d262c059bfe79f74b8bccec8c03':
  Volume a11y: Resize zen footer text when changed.

9 years agoam 0c467064: Merge "Volume a11y: Rename introduction \'confirm\' button to \'close...
John Spurlock [Tue, 12 May 2015 21:31:25 +0000 (21:31 +0000)]
am 0c467064: Merge "Volume a11y: Rename introduction \'confirm\' button to \'close\'." into mnc-dev

* commit '0c467064e2ae4a49ae45cb87509e578dd021daf6':
  Volume a11y: Rename introduction 'confirm' button to 'close'.

9 years agoam 54e685c4: Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuit...
Tim Murray [Tue, 12 May 2015 21:31:12 +0000 (21:31 +0000)]
am 54e685c4: Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev

* commit '54e685c4bc37c4d1258d3e272e5c012891d7e573':
  Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest

9 years agoam cfd6e9df: Merge "Add alternate intents and refinement callbacks to ChooserActivity...
Adam Powell [Tue, 12 May 2015 21:30:59 +0000 (21:30 +0000)]
am cfd6e9df: Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev

* commit 'cfd6e9dfd063cba795497f251aa6f7fe2554f10b':
  Add alternate intents and refinement callbacks to ChooserActivity

9 years agoam 0a323036: Merge "Revert "camera: Start/stop preview before clearing surface."...
Ruben Brunk [Tue, 12 May 2015 21:30:40 +0000 (21:30 +0000)]
am 0a323036: Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev

* commit '0a323036e2351ce4e9347ca1a1b5664e0f6e7672':
  Revert "camera: Start/stop preview before clearing surface."

9 years agoam 60137fdc: Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev
Sanket Padawe [Tue, 12 May 2015 21:30:27 +0000 (21:30 +0000)]
am 60137fdc: Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev

* commit '60137fdcb3294acb3faf8a31d96cb6aa2dd78b1a':
  Saved network summary string fixes in Wifi Settings

9 years agoam 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into...
Seigo Nonaka [Tue, 12 May 2015 21:30:02 +0000 (21:30 +0000)]
am 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev

* commit '06bdf9c6a6e2a23f18129cf390c6277085210dd1':
  Always show auxiliary subtypes from NavBar keyboard icon.

9 years agoam a1d3c508: Merge "Fix requestRestore() of an app\'s own package" into mnc-dev
Christopher Tate [Tue, 12 May 2015 21:29:50 +0000 (21:29 +0000)]
am a1d3c508: Merge "Fix requestRestore() of an app\'s own package" into mnc-dev

* commit 'a1d3c508e160b35f4f8ef56c2fb2fd6f65d5cbbd':
  Fix requestRestore() of an app's own package

9 years agoam 22f07f89: Merge "Fix Allocation-less launches" into mnc-dev
Jason Sams [Tue, 12 May 2015 21:29:44 +0000 (21:29 +0000)]
am 22f07f89: Merge "Fix Allocation-less launches" into mnc-dev

* commit '22f07f89df69e888ffb9e7b8e498cc8ac5fb282f':
  Fix Allocation-less launches

9 years agoam a0511081: Merge "Add loop option to hwuitest." into mnc-dev
Tim Murray [Tue, 12 May 2015 21:29:32 +0000 (21:29 +0000)]
am a0511081: Merge "Add loop option to hwuitest." into mnc-dev

* commit 'a0511081d037722a89d3d69e7edcd0d0dc6ec965':
  Add loop option to hwuitest.

9 years agoam 9260cb7f: Merge "count panel open method" into mnc-dev
Chris Wren [Tue, 12 May 2015 21:29:15 +0000 (21:29 +0000)]
am 9260cb7f: Merge "count panel open method" into mnc-dev

* commit '9260cb7ffe0845d229a8cfe948b4ba30fe32127b':
  count panel open method

9 years agoam b65cd17b: Merge "Implement audio routing callbacks" into mnc-dev
Eric Laurent [Tue, 12 May 2015 21:28:56 +0000 (21:28 +0000)]
am b65cd17b: Merge "Implement audio routing callbacks" into mnc-dev

* commit 'b65cd17b0508a5a7afdd92e69437825071a1631b':
  Implement audio routing callbacks

9 years agoam 6223ec12: Merge "Keystore uses 0 for invalid operation handles." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 21:28:33 +0000 (21:28 +0000)]
am 6223ec12: Merge "Keystore uses 0 for invalid operation handles." into mnc-dev

* commit '6223ec129b256526d8c30920271b2ee3960bcf1f':
  Keystore uses 0 for invalid operation handles.

9 years agoam 809d5d7f: Merge "DayNight theme for framework packages" into mnc-dev
Alan Viverette [Tue, 12 May 2015 21:28:24 +0000 (21:28 +0000)]
am 809d5d7f: Merge "DayNight theme for framework packages" into mnc-dev

* commit '809d5d7fbe20e6c84ea19480efa531af765b792b':
  DayNight theme for framework packages

9 years agoam 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into...
Alan Viverette [Tue, 12 May 2015 21:28:06 +0000 (21:28 +0000)]
am 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev

* commit '4d5c20c613a6716b14bd8ca3f178672c356a89e5':
  ListPopupWindow should use window layout type SUB_PANEL

9 years agoam 26d955fd: Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into...
Jeff Tinker [Tue, 12 May 2015 21:27:57 +0000 (21:27 +0000)]
am 26d955fd: Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev

* commit '26d955fd02e0bf3f76c50bceeba4b61598f1a8b2':
  Clarify wording of MediaCrypto exception "ERROR_NO_KEY"

9 years agoam 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
Alan Viverette [Tue, 12 May 2015 21:27:48 +0000 (21:27 +0000)]
am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev

* commit '71b0cb043f410d7f0a7852b2f297124fa9aed0e2':
  Add scroll indicators on View, use in AlertDialog

9 years agoam c97b922a: Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev
Alan Viverette [Tue, 12 May 2015 21:27:41 +0000 (21:27 +0000)]
am c97b922a: Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev

* commit 'c97b922abae0b66fcbd6138f803c9d8a23024e6e':
  Fix setting hotspot bounds in a drawable container

9 years agoam 444eda08: Merge "Zen: Calendar tracker should use event availability." into mnc-dev
John Spurlock [Tue, 12 May 2015 21:27:33 +0000 (21:27 +0000)]
am 444eda08: Merge "Zen: Calendar tracker should use event availability." into mnc-dev

* commit '444eda0836095f58388456355e80cf3b9b127bf4':
  Zen: Calendar tracker should use event availability.

9 years agoam ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider API signature....
Tyler Gunn [Tue, 12 May 2015 21:27:27 +0000 (21:27 +0000)]
am ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev

* commit 'ed7cbf111f5970ab56e557cd785063068405b563':
  Change sendSessionModifyRequest VideoProvider API signature.

9 years agoam 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev
Benjamin Franz [Tue, 12 May 2015 21:27:10 +0000 (21:27 +0000)]
am 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev

* commit '94fb2024b013522e95a880e02b73886fa7d01222':
  Rename functions that disable status bar and keyguard

9 years agoam 0fb5aa65: Merge "Removed unused Face Unlock string" into mnc-dev
Brian Colonna [Tue, 12 May 2015 21:27:01 +0000 (21:27 +0000)]
am 0fb5aa65: Merge "Removed unused Face Unlock string" into mnc-dev

* commit '0fb5aa656e45476142c81e0cf3aa0fdd4a16af9f':
  Removed unused Face Unlock string

9 years agoam fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev
Clara Bayarri [Tue, 12 May 2015 21:26:46 +0000 (21:26 +0000)]
am fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev

* commit 'fbb34dd8df7bc89ae972c545130e76c5bbb4176e':
  Allow Floating ActionModes in SearchDialog.

9 years agoam 7f76ff39: Merge "Fix checkbox animation end colors" into mnc-dev
Alan Viverette [Tue, 12 May 2015 21:26:11 +0000 (21:26 +0000)]
am 7f76ff39: Merge "Fix checkbox animation end colors" into mnc-dev

* commit '7f76ff39b7d0ac7aa31c9528c179e1a99578c108':
  Fix checkbox animation end colors

9 years agoam c9399a80: Merge "Fix overcounting of mobile radio" into mnc-dev
Adam Lesinski [Tue, 12 May 2015 21:25:56 +0000 (21:25 +0000)]
am c9399a80: Merge "Fix overcounting of mobile radio" into mnc-dev

* commit 'c9399a80448ddc4a01d5a9c3d738f3077f70233c':
  Fix overcounting of mobile radio

9 years agoam f1ca5777: am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle...
Rich Slogar [Tue, 12 May 2015 21:25:42 +0000 (21:25 +0000)]
am f1ca5777: am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs

* commit 'f1ca5777283cd647a629456e163f68376f1415b1':
  docs: gradle multidex update

9 years agoam 8bbbbd2a: am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overvie...
Rich Slogar [Tue, 12 May 2015 21:25:30 +0000 (21:25 +0000)]
am 8bbbbd2a: am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs

* commit '8bbbbd2afdbb488cfb81bb6b9f9398e49e34bd96':
  docs: overview link to release notes

9 years agoam c98d6ae3: am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: transla...
Rich Slogar [Tue, 12 May 2015 21:25:21 +0000 (21:25 +0000)]
am c98d6ae3: am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs

* commit 'c98d6ae334a055aba7f11c0e49eef2973c8f048b':
  docs: translation editor update

9 years agoam 5464b5ca: am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory...
Rich Slogar [Tue, 12 May 2015 21:25:07 +0000 (21:25 +0000)]
am 5464b5ca: am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs

* commit '5464b5ca62f9c8bb7b76872fad74ba0387319fd3':
  docs: memory monitor duplicate paragraph

9 years agoam 138ab381: am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources...
Rich Slogar [Tue, 12 May 2015 21:24:54 +0000 (21:24 +0000)]
am 138ab381: am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit '138ab38141614e28a5936b3cefcfc6607ec30dcf':
  docs: providing resources link

9 years agoam bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into...
John Spurlock [Tue, 12 May 2015 21:24:10 +0000 (21:24 +0000)]
am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev

* commit 'bc1a2ad8785415d1a4f86b3e477ff16e2e68f795':
  Zen: Maintain source filters for both calls and messages.

9 years agoam 57bbb8d6: Merge "Remove unused aapt target." into mnc-dev
Chih-Hung Hsieh [Tue, 12 May 2015 21:23:53 +0000 (21:23 +0000)]
am 57bbb8d6: Merge "Remove unused aapt target." into mnc-dev

* commit '57bbb8d6812bcb0813ef2530cef060e5d798033b':
  Remove unused aapt target.

9 years agoam 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev
Amith Yamasani [Tue, 12 May 2015 21:23:27 +0000 (21:23 +0000)]
am 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev

* commit '19343927c2cce0b8dfdd1df8309ce82c3d39b0d5':
  Permission policies are for profile and device owners

9 years agoam afa81ed0: am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScrip...
Jean-Luc Brouillet [Tue, 12 May 2015 21:23:07 +0000 (21:23 +0000)]
am afa81ed0: am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit 'afa81ed0b174eb6b81b811fac5cd5df2edb0f798':
  docs: Overhaul of the RenderScript reference documentation.

9 years agoam 6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
Selim Cinek [Tue, 12 May 2015 21:22:59 +0000 (21:22 +0000)]
am 6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev

* commit '6da881ba7d6b2b860770aabcb0daefcde85ece20':
  Fixed a measuring bug when the panel was collapsed

9 years agoam 1e139e86: Merge "Enforcing the touchslop now when flinging open before interceptin...
Selim Cinek [Tue, 12 May 2015 21:22:51 +0000 (21:22 +0000)]
am 1e139e86: Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev

* commit '1e139e86843b59839f9eb6f88466d152b7e23c03':
  Enforcing the touchslop now when flinging open before intercepting

9 years agoam 1690ec8e: Merge "Fixed a bug where the notifications would jump when going to...
Selim Cinek [Tue, 12 May 2015 21:22:37 +0000 (21:22 +0000)]
am 1690ec8e: Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev

* commit '1690ec8e72876459da198a7228c6591df321df64':
  Fixed a bug where the notifications would jump when going to the full shade

9 years agoam e9194b98: Merge "Extended test to support launching assist above lock screen"...
Selim Cinek [Tue, 12 May 2015 21:22:26 +0000 (21:22 +0000)]
am e9194b98: Merge "Extended test to support launching assist above lock screen" into mnc-dev

* commit 'e9194b98a2098a1d94957e4723eaaf7399ecf3be':
  Extended test to support launching assist above lock screen

9 years agoam 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into...
Selim Cinek [Tue, 12 May 2015 21:22:05 +0000 (21:22 +0000)]
am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev

* commit '6329bbceebc8c0d6de164cb693a828402542fd35':
  The voice assist may now be launched above the lockscreen

9 years agoam 9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev
Etan Cohen [Tue, 12 May 2015 21:21:18 +0000 (21:21 +0000)]
am 9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev

* commit '9c7ce8b0fc8e429e2524b346174cb67b59c7e175':
  Disable VT over IMS feature.

9 years agoam 915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev
Jae Seo [Tue, 12 May 2015 21:21:05 +0000 (21:21 +0000)]
am 915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev

* commit '915389d4b8626cb35bd752420da5d21ec98c209a':
  TIF: Make all the parameters for UNRATED null

9 years agoam e74007de: Merge "Clean up error handling in CopyService." into mnc-dev
Ben Kwa [Tue, 12 May 2015 21:20:30 +0000 (21:20 +0000)]
am e74007de: Merge "Clean up error handling in CopyService." into mnc-dev

* commit 'e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
  Clean up error handling in CopyService.

9 years agoam 570de1e0: Make sure fingerprint error messages are handled in Keyguard
Jorim Jaggi [Tue, 12 May 2015 21:20:21 +0000 (21:20 +0000)]
am 570de1e0: Make sure fingerprint error messages are handled in Keyguard

* commit '570de1e0e903f11ab74b0fd386b17494cd66ff33':
  Make sure fingerprint error messages are handled in Keyguard

9 years agoam 356b1777: Merge "Cleanup properties" into mnc-dev
Chris Craik [Tue, 12 May 2015 21:19:59 +0000 (21:19 +0000)]
am 356b1777: Merge "Cleanup properties" into mnc-dev

* commit '356b1777092e7da3ac5eae0bc94bd21e1cf9319a':
  Cleanup properties

9 years agoam d6abbd29: Merge "Dump profile info after running test" into mnc-dev
John Reck [Tue, 12 May 2015 21:19:39 +0000 (21:19 +0000)]
am d6abbd29: Merge "Dump profile info after running test" into mnc-dev

* commit 'd6abbd29b7f453397036cf602655534bbd6c0430':
  Dump profile info after running test

9 years agoam b2e3b744: Merge "WiFi Calling: Show different operator name string in Data usage...
Pavel Zhamaitsiak [Tue, 12 May 2015 21:19:30 +0000 (21:19 +0000)]
am b2e3b744: Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev

* commit 'b2e3b74418f7fc09f2610bc5620e748d420b5f87':
  WiFi Calling: Show different operator name string in Data usage dialog.

9 years agoam 2b0eaffc: Merge "Hide lockscreen contents from a11y while bouncer is showing"...
Adrian Roos [Tue, 12 May 2015 21:19:22 +0000 (21:19 +0000)]
am 2b0eaffc: Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev

* commit '2b0eaffc6264abb4162c089adf7089b4cfee5719':
  Hide lockscreen contents from a11y while bouncer is showing

9 years agoam 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev
Jorim Jaggi [Tue, 12 May 2015 21:19:16 +0000 (21:19 +0000)]
am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev

* commit '5be4d295c08614eaf8afd012f90e5c7726bc293e':
  Only enable fingerprint auth after first regular auth

9 years agoam d5304020: Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into...
John Spurlock [Tue, 12 May 2015 21:19:11 +0000 (21:19 +0000)]
am d5304020: Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev

* commit 'd5304020b29762ce79d66c1ed3028b0ee30c68ad':
  Volume A11y: Prevent auto-dismiss when feedback enabled.

9 years agoam 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev
Hiroshi Yamauchi [Tue, 12 May 2015 21:19:06 +0000 (21:19 +0000)]
am 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev

* commit '95e6c78f3f71850931f69fc562f68e0c46430981':
  Fix binder force gc will block binder thread

9 years agoam 5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev
Prabhakar Thirumoorthy [Tue, 12 May 2015 21:18:58 +0000 (21:18 +0000)]
am 5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev

* commit '5b402fd8963e4700973597650b6992444ff8ffdd':
  Update permissions on memory usage instrumentation

9 years agoam efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from...
Ben Kwa [Tue, 12 May 2015 21:18:34 +0000 (21:18 +0000)]
am efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from   DO NOT MERGE" into mnc-dev

* commit 'efb70fd8a0a37ddd08356120fb63ff62694eaea0':
  Cherry pick beefed-up error handling in the CopyService from master.  DO NOT MERGE

9 years agoam d5fb9cac: am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge...
Andrew Solovay [Tue, 12 May 2015 21:17:58 +0000 (21:17 +0000)]
am d5fb9cac: am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'd5fb9cac87d65d59e9d2c0fa4242fb6eeb4edf6d':

9 years agoam 34265cd9: media: Added MPEG2 profile/levels and tests
Harish Mahendrakar [Tue, 12 May 2015 21:17:48 +0000 (21:17 +0000)]
am 34265cd9: media: Added MPEG2 profile/levels and tests

* commit '34265cd94f76cc18648c310e4f120d280bf3a0a4':
  media: Added MPEG2 profile/levels and tests

9 years agoam def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted"...
Tony Mantler [Tue, 12 May 2015 21:17:37 +0000 (21:17 +0000)]
am def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted" into mnc-dev

* commit 'def4c0c49aeebccbb42d9b82901a7de81782baad':
  Don't crash in StorageMeasurement if volume isn't mounted

9 years agoam 102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev
Yang Ni [Tue, 12 May 2015 21:17:25 +0000 (21:17 +0000)]
am 102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev

* commit '102badf834256e209e1a5f58fde1d67b8fd5ac0b':
  Sanity checks in JNI code for closure creation

9 years agoam be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev
Raph Levien [Tue, 12 May 2015 21:17:17 +0000 (21:17 +0000)]
am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev

* commit 'be8db119726a229ca687b99fcdb8a6a959648cd1':
  Fix NPE in Html.inParagraph()

9 years agoam 9e540a51: Merge "Fixing docs." into mnc-dev
Julia Reynolds [Tue, 12 May 2015 21:16:55 +0000 (21:16 +0000)]
am 9e540a51: Merge "Fixing docs." into mnc-dev

* commit '9e540a512281560a9b4ffc0edbe68cddaf9bc3b4':
  Fixing docs.

9 years agoam 1542179b: Merge "Add hidden methods to set/get default dialer across users" into...
Yorke Lee [Tue, 12 May 2015 21:16:42 +0000 (21:16 +0000)]
am 1542179b: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit '1542179bd2bc82db31a925550b47151cf579c767':
  Add hidden methods to set/get default dialer across users

9 years agoam fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev
John Reck [Tue, 12 May 2015 21:16:33 +0000 (21:16 +0000)]
am fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev

* commit 'fe2f7e31be01c8c0ebcbdfb1ff8ae420f24c0ac2':
  Add some basic DA unit tests

9 years agoam 424681e4: Settings UI for SIM access profile (2/2)
Casper Bonde [Tue, 12 May 2015 21:15:59 +0000 (21:15 +0000)]
am 424681e4: Settings UI for SIM access profile (2/2)

* commit '424681e43e454bfcbceb863ddccb875ea57ec26f':
  Settings UI for SIM access profile (2/2)

9 years agoam 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme...
Alan Viverette [Tue, 12 May 2015 21:15:30 +0000 (21:15 +0000)]
am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev

* commit '261208e002775fe9a9f4e79e9f70b41852cfbe60':
  Add API for obtaining changing configurations bitmask from Theme

9 years agoam 28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
Jean-Michel Trivi [Tue, 12 May 2015 21:14:52 +0000 (21:14 +0000)]
am 28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev

* commit '28a516280a59a81aeecbf4a68057019d59feb872':
  AudioRecord JNI: use default UID / PID

9 years agoam 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
Todd Kennedy [Tue, 12 May 2015 21:14:42 +0000 (21:14 +0000)]
am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev

* commit '3266f60ba0c2a37883446cadbfc00bb8354824d0':
  Call Activity#onAttachFragment()

9 years agoam e02b7868: Merge "Call profile changed in cases were focused activity is nulled...
Kenny Guy [Tue, 12 May 2015 21:14:27 +0000 (21:14 +0000)]
am e02b7868: Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev

* commit 'e02b7868c6c8f856a21f36569a77dab7f1cc7c78':
  Call profile changed in cases were focused activity is nulled.

9 years agoam 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
Svet Ganov [Tue, 12 May 2015 21:14:06 +0000 (21:14 +0000)]
am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev

* commit '4a64b19f239b6bff82a032329ce5781681843044':
  Permission UI - legacy apps support

9 years agoam c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev
John Reck [Tue, 12 May 2015 21:13:44 +0000 (21:13 +0000)]
am c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev

* commit 'c64b3fab95cff6f33cba524f1b9c540cfb75c73b':
  Attempt to solve the double-GC problem

9 years agoam 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
John Spurlock [Tue, 12 May 2015 21:13:34 +0000 (21:13 +0000)]
am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev

* commit '0bc8afff7eb3b5af72b7e9a4ce3954488bfbecd0':
  Zen: Remove calendar rule attendance attribute.