Commit Graph

149632 Commits

Author SHA1 Message Date
Adam Lesinski
ac44bd1c5b am 4e790e9e: am b4c3c976: Fix crash in ResStringPool
* commit '4e790e9e4b820290284a78c4258d4d60e8d37320':
  Fix crash in ResStringPool
2014-08-15 11:51:01 +00:00
Jeff Sharkey
30f5639cb7 am 9c5fc77d: am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev
* commit '9c5fc77decaaec349a9f64486fb203eceb4549aa':
  Some networks may have null ifaces, I guess?
2014-08-15 11:50:18 +00:00
Craig Mautner
e8109f3fb5 am 045f1829: am e1de4a43: Merge "Fix race condition between binder deaths" into lmp-dev
* commit '045f182952f21a2ef3d5c8c3d335a63d895d17a9':
  Fix race condition between binder deaths
2014-08-15 11:49:59 +00:00
Sailesh Nepal
434f458c47 am 5294dc9c: am 1d932b53: Use thread safe set for RemoteConnection.mListeners
* commit '5294dc9c5802028275dc3bb2d9a8bb5ee1187b3e':
  Use thread safe set for RemoteConnection.mListeners
2014-08-15 11:49:52 +00:00
Sailesh Nepal
515d44da28 am 50334170: am b4e212cf: Include more state in ParcelableConnection
* commit '503341702a6265ec48665dd2d0425173a7abc82f':
  Include more state in ParcelableConnection
2014-08-15 11:49:47 +00:00
Justin Mattson
704cad4cf5 am 1f1f7e65: am 48734f62: Merge "Tweak leanback form style" into lmp-dev
* commit '1f1f7e65f856154768439e643d01935bed5bb597':
  Tweak leanback form style
2014-08-15 11:49:43 +00:00
Adam Lesinski
fd9205603a am f3e588ba: am 83b8dc7e: Merge "Fix aapt dump for APKs with no resources" into lmp-dev
* commit 'f3e588bae0b6bdfef1c09f739b68b3e07548f58f':
  Fix aapt dump for APKs with no resources
2014-08-15 11:49:20 +00:00
Adam Lesinski
20ad556d75 am 3c9b2a54: am b6355bcb: Merge "Print xxxhdpi from ResTable_config::toString" into lmp-dev
* commit '3c9b2a540e123a17c91883dd48fb703c6a31982d':
  Print xxxhdpi from ResTable_config::toString
2014-08-15 11:49:15 +00:00
Yorke Lee
90955a5c62 am fe3c8a10: am e991c97b: Merge "Show InCallScreen when swiping phone affordance while in a call" into lmp-dev
* commit 'fe3c8a101d7d3e0c87b3ee2d7a5b497ade4cf34f':
  Show InCallScreen when swiping phone affordance while in a call
2014-08-15 11:49:10 +00:00
Jim Miller
a3864a79f8 am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev
* commit '378f4bc4dd0945d6876159ad6fa7c9909261200a':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
2014-08-15 11:49:05 +00:00
Chris Craik
5a59d60aa0 am 1458bc7c: am 36531e51: Merge "Fix nine patch outline radius computation" into lmp-dev
* commit '1458bc7c2896664d6647df0206e923830e93fdb1':
  Fix nine patch outline radius computation
2014-08-15 11:49:01 +00:00
Chris Craik
619f45c1d8 am 910ba285: am 6df9d135: Define shadow casting behavior within layers
* commit '910ba285503970986941744155a42a570aa1d781':
  Define shadow casting behavior within layers
2014-08-15 11:48:56 +00:00
Chris Craik
64a297f636 am 860a05e3: am 36314a4c: Disable shadow casting for transparent BitmapDrawables
* commit '860a05e358fad74c0d8a8b7e43bde6bb23a9142f':
  Disable shadow casting for transparent BitmapDrawables
2014-08-15 11:48:51 +00:00
Alan Viverette
baa61eeef2 am db31926c: am d264eeda: Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev
* commit 'db31926c2256a25de317c76597493d617797bb55':
  Fix TextView clickable state when using onClick attribute
2014-08-15 11:48:44 +00:00
John Reck
0cbdda5965 am 1550e253: am 0566908c: Fix hwuitask & RT priorities
* commit '1550e25302419fc06028e914f707ef73f6f1b616':
  Fix hwuitask & RT priorities
2014-08-15 11:48:39 +00:00
Chet Haase
1470d8f0ae am 3d6c62cb: am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev
* commit '3d6c62cb5157a8353b197d8d3d42c50e027b83c6':
  ActionBarOverlay needs to be focusable
2014-08-15 11:48:08 +00:00
Amit Mahajan
d4e8696840 am e7eb8925: am 94819cff: Merge "Contribute roaming configuration for domestic roaming and non-roaming cases" into lmp-dev
* commit 'e7eb8925a7fc6f6bdfe2676a270063ffb0f09fd3':
  Contribute roaming configuration for domestic roaming and non-roaming cases
2014-08-15 11:47:47 +00:00
Jorim Jaggi
8274fdc9f4 am 7aedbc98: am 80632796: Fix emergency call when in launch transition.
* commit '7aedbc9850d885b988174f2daa239361fce28ab2':
  Fix emergency call when in launch transition.
2014-08-15 11:37:03 +00:00
Chulwoo Lee
b17a021002 am 1a3e2e11: am 5c101aef: Merge "TIF: Set translatable false for rating descriptions" into lmp-dev
* commit '1a3e2e11088e63d3f7d04bb4373aa8f70e42cc90':
  TIF: Set translatable false for rating descriptions
2014-08-15 11:36:50 +00:00
Jae Seo
1dce2bda57 am dcc6214e: am deacaa18: Merge "TIF: Change the directory of the state file" into lmp-dev
* commit 'dcc6214e828ce0fbdfd781287dbcda76a4566363':
  TIF: Change the directory of the state file
2014-08-15 11:36:37 +00:00
Nancy Chen
ef82b6450b am fc0290dc: am c3e6845b: Merge "Add extras for outgoing call" into lmp-dev
* commit 'fc0290dc1589e9d0384db4baeaa2da70c63144e2':
  Add extras for outgoing call
2014-08-15 11:36:32 +00:00
Jorim Jaggi
400cc27d5a am 0a370246: am 5a195a5c: Hide icons on Keyguard when QS is open
* commit '0a370246a054d92149b77d482df8f474a3cab927':
  Hide icons on Keyguard when QS is open
2014-08-15 11:36:22 +00:00
Jorim Jaggi
976de8352a am fddc21ff: am e1b38697: Fix QS expansion weirdness
* commit 'fddc21ff47bf05abfd78d40a2dbb48294fbd591d':
  Fix QS expansion weirdness
2014-08-15 11:36:17 +00:00
Tim Murray
9efc5f850a am 0114c091: am 71f7d5fb: Merge "Allocation.resize() should throw an exception in API 21+." into lmp-dev
* commit '0114c091429932f98712326edef53e35147e8743':
  Allocation.resize() should throw an exception in API 21+.
2014-08-15 11:36:10 +00:00
Adam Lesinski
ebb5946959 am f475f1df: am dd4c3af1: Merge "Ensure that split names are valid" into lmp-dev
* commit 'f475f1df54c8432511025157ecea5b32ee6251b8':
  Ensure that split names are valid
2014-08-15 11:36:03 +00:00
Jorim Jaggi
094dbb3272 am f34b5f62: am dfb8bbd5: Fix scaling of text in quick settings header view
* commit 'f34b5f62b8b0398d672ec8560f994682e30449da':
  Fix scaling of text in quick settings header view
2014-08-15 11:35:46 +00:00
George Mount
c3b821494d am dd29ffc5: am fe8529f1: Don\'t blink in views that haven\'t transitioned yet.
* commit 'dd29ffc5593eea0c829d5ec7d773f140bd0662e8':
  Don't blink in views that haven't transitioned yet.
2014-08-15 11:35:35 +00:00
Paul McLean
0a4465bdcb am 18083aae: am 04156f72: Merge "Fix ALSA initialized wait for input-only USB Audio devices" into lmp-dev
* commit '18083aae06c0935bd58290f2c8df2f7deaf8f03d':
  Fix ALSA initialized wait for input-only USB Audio devices
2014-08-15 11:35:26 +00:00
Adam Powell
9e6e6e4496 am f38fb34a: am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev
* commit 'f38fb34adb4b5929e611aadf0c6bb43e5acdb4ac':
  Show checkmarks at the start of material AlertDialog list items
2014-08-15 11:35:22 +00:00
Alan Viverette
ec8d66cf55 am 96aab72d: am 5c9feadd: Merge "Make sure we\'re obtaining themed drawables correctly" into lmp-dev
* commit '96aab72d045b646c551ebf5d765653447863794c':
  Make sure we're obtaining themed drawables correctly
2014-08-15 11:35:14 +00:00
Jason Monk
21616def11 am 0e8c7a0d: am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev
* commit '0e8c7a0d216f74d89113398d7f9f6c8ff8432e37':
  Switch exiting screen pinning to recents+back
2014-08-15 11:35:09 +00:00
Alan Viverette
8dce7c3ae5 am 170402a8: am e4ac85c2: Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev
* commit '170402a8f9729afc087fb17b15d4ed2bfda13cbf':
  Prevent SwitchPreference widget from receiving a11y focus
2014-08-15 11:35:04 +00:00
Alan Viverette
602683909b am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration()
* commit '54e70a6e81deab85c3f875eee57bc30b35c34dcf':
  Deprecate InputMethodService.enableHardwareAcceleration()
2014-08-15 11:34:59 +00:00
Alan Viverette
0619830051 am 5e49cec8: am 056941f1: Merge "Don\'t set textColor in button style" into lmp-dev
* commit '5e49cec80d772b83b7061a5bd4d3c7c62074f3e0':
  Don't set textColor in button style
2014-08-15 11:34:54 +00:00
Anish Athalye
dd4308f5e7 am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev
* commit '675f13bfa8abcc439af1218e9de4d834e9253ede':
  Make LeadingMarginSpan2 behavior more consistent
2014-08-15 11:34:47 +00:00
Jorim Jaggi
b1eada4fcf am aca1a03b: am dd26d8b2: Fix listening states for two-finger and fast-double swipe
* commit 'aca1a03b6f6c5a923ea91273df61a575de425d9a':
  Fix listening states for two-finger and fast-double swipe
2014-08-15 11:34:37 +00:00
Jorim Jaggi
e7113377f5 am ef8de29e: am 1550dd96: Don\'t scale notifications on Keyguard for devices < xxhdpi
* commit 'ef8de29e61f374b19e25c015dc499afc16044c13':
  Don't scale notifications on Keyguard for devices < xxhdpi
2014-08-15 11:34:19 +00:00
Jorim Jaggi
021675890f am f6042bff: am 7bcbac87: Merge "Disable DragDownHelper in QS" into lmp-dev
* commit 'f6042bff3732153a3e4dc71c1e6014a8c2153710':
  Disable DragDownHelper in QS
2014-08-15 11:34:14 +00:00
Dan Sandler
be33c94a85 am 2d117e78: am c514a213: No need for drawing caches on notifications.
* commit '2d117e781603b2d73600b4f9db0f5622cfa13d41':
  No need for drawing caches on notifications.
2014-08-15 11:34:09 +00:00
Adrian Roos
4a0f09f50e am f9f28f94: am cdc67b67: Label user switcher button for accessibility
* commit 'f9f28f947c2046ebc2fda8f0b5caa6a3c7d441a1':
  Label user switcher button for accessibility
2014-08-15 11:33:49 +00:00
RoboErik
f1dbc6bffb am 866ae744: am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev
* commit '866ae74437ca37109a328c70696c7ee92e4d045c':
  Pipe caller's identity through volume methods
2014-08-15 11:33:33 +00:00
Fabrice Di Meglio
6652b30039 am b73577a9: am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered
* commit 'b73577a925e4acd930aea25bae17a04352d09bc3':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
2014-08-15 11:33:14 +00:00
Winson Chung
f65cefb6dd am 1f141c58: am 91f8e91e: Merge "Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)" into lmp-dev
* commit '1f141c581ac5d32e6cf29a7f4803676ad8d27d3b':
  Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)
2014-08-15 11:33:09 +00:00
Adam Lesinski
5b9c045a6a am b4c3c976: Fix crash in ResStringPool
* commit 'b4c3c9761bcdbf9ed3eb01c0145294dd730666bf':
  Fix crash in ResStringPool
2014-08-15 07:05:43 +00:00
Adam Lesinski
4b2d0f20db Fix crash in ResStringPool
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
2014-08-15 06:39:01 +00:00
Jeff Sharkey
07a36b1889 am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev
* commit 'b76b06d8efcc13ada2aaa250540a65fb8d60560a':
  Some networks may have null ifaces, I guess?
2014-08-15 04:36:05 +00:00
Jae Seo
5cb7a38455 am 85d40b29: am 8b6c899b: Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
* commit '85d40b296f55d1a66a23304ee48f1f33de144ea6':
  TIF: fix IOException at PersistentDataStore.save()
2014-08-15 04:00:31 +00:00
Jae Seo
1566648de7 am cecfd8e4: am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev
* commit 'cecfd8e45ed232b1ea285a236c31af3f3565613f':
  TIF: Rename R.attr.contentRatingSystemXml and fix documentation
2014-08-15 04:00:13 +00:00
Amit Mahajan
38a42369d2 am b744a608: am cb8fce42: Merge "Revert "Revert "add apn setting parameters, and set apn parameters to bp""" into lmp-dev
* commit 'b744a6083a7d6eea54963d5b83ad100694500995':
  Revert "Revert "add apn setting parameters, and set apn parameters to bp""
2014-08-15 04:00:06 +00:00
RoboErik
0507a5b336 am 8ce00c8b: am cf7e33d3: Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev
* commit '8ce00c8b2f8b87016a4bcc93d12c30be22d85f86':
  Remove REMOTE_STREAM_MUSIC references from AudioService
2014-08-15 03:59:59 +00:00