150554 Commits

Author SHA1 Message Date
Griff Hazen
c37c9708c3 am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev
* commit 'fd7d35d0ce4f9fc585b42f11c1844ddbaab6307f':
  Reduce chance of notification listener dropped messages.
2014-09-05 21:58:25 +00:00
Derek Tan
1eda68766b Update the comment in sendEnvelope.
Bug: 17255752
Change-Id: I4b56447e28bc9838b9ae0425a3673891647116d1
2014-09-05 14:56:32 -07:00
Nancy Chen
eec15f90e7 am 266fcee6: Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev
* commit '266fcee694598b685fb4d33c6e6a581b0152704d':
  Rename listener to callback for ConferenceManager and rename strings 1/4
2014-09-05 21:52:47 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
Derek Tan
274baa73c5 Remove setCdmaSubscription API.
Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
2014-09-05 14:48:11 -07:00
Jean-Michel Trivi
91488f464d am aa82a6c7: Merge "Update the broadcasts reserved to the system" into lmp-dev
* commit 'aa82a6c7adc6de4ec3f843328f7bb207aa6540ec':
  Update the broadcasts reserved to the system
2014-09-05 21:47:31 +00:00
Nancy Chen
cf2858d363 Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev 2014-09-05 21:46:27 +00:00
dcashman
2de4f9f971 Fix boolean comparison after sig check.
Bug: 17402843
Change-Id: I0cb5ffba1a93f71a250294a41040011234ce1029
2014-09-05 14:45:46 -07:00
Jean-Michel Trivi
d87f2107d9 Merge "Update the broadcasts reserved to the system" into lmp-dev 2014-09-05 21:37:27 +00:00
Carlos Valdivia
e55634c087 am aa6e14fd: Merge "We shouldn\'t delete accounts when a package is being updated." into lmp-dev
* commit 'aa6e14fda27cfc7a9bfdcef90adda3563b1846a8':
  We shouldn't delete accounts when a package is being updated.
2014-09-05 21:05:27 +00:00
Jae Seo
1e25b1f8a8 am caf3c12c: Merge "API review: android.media.tv" into lmp-dev
* commit 'caf3c12ca1ee420acdbb0181ffe5a0497ce84af3':
  API review: android.media.tv
2014-09-05 21:05:23 +00:00
Aravind Akella
65e74377d9 am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev
* commit '6a7a06ee74ec3c63a4096be5bf2e3d18c9867170':
  Documentation fix for Sensor.getMaxDelay()
2014-09-05 21:05:19 +00:00
Jim Miller
9e349078ab am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev
* commit '2dfada6c875acffd17f541aaac47aafb265b0164':
  Cleanup - Change name of confirm credentials method after API review
2014-09-05 21:05:15 +00:00
Carlos Valdivia
605e71922e Merge "We shouldn't delete accounts when a package is being updated." into lmp-dev 2014-09-05 21:01:53 +00:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Nancy Chen
1d834f51df Rename listener to callback for ConferenceManager and rename strings 1/4
Updates for items from API review. See bug for details.

Bug: 17390175
Change-Id: I716a12b763766a385b08f8731d9533589639f467
2014-09-05 13:59:11 -07:00
Aravind Akella
b67d7e2345 Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 2014-09-05 20:58:53 +00:00
Carlos Valdivia
23f58260bd We shouldn't delete accounts when a package is being updated.
Bug: 17158237
Change-Id: Icbf9e672a6a698737b08ed39c78a64c161a7b802
2014-09-05 13:58:31 -07:00
Jim Miller
fd5bf4ea77 Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 2014-09-05 20:58:17 +00:00
Eino-Ville Talvala
0eeac755df am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
2014-09-05 20:52:48 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Jae Seo
2778f5a7bd API review: android.media.tv
TvInputInfo
- Renamed getIntentForSettingsActivity to createSettingsIntent.
- Renamed getIntentForSetupActivity to createSetupIntent.
- Changed the value of EXTRA_INPUT_ID from inputId to
  android.media.tv.extra.INPUT_ID.
- Removed @hiden from CREATOR.

TvInputManager
- Renamed TvInputListener to TvInputCallback.
- Renamed registerListener to registerCallback.
- Renamed unregisterListener to unregisterCallback.
- Changed the value of ACTION_BLOCKED_RATINGS_CHANGED from
  android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED
  to android.media.tv.action.BLOCKED_RATINGS_CHANGED.
- Changed the value of ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED from
  android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED
  to android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED.
- Changed the value of ACTION_QUERY_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS
  to android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS.
- Changed the value of META_DATA_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS
  to android.media.tv.metadata.CONTENT_RATING_SYSTEMS.

TvView
- Renamed TvInputListener to TvInputCallback.
- Renamed setTvInputListener to setCallback.

Bug: 17389538
Change-Id: I3dceee3db67862d77b183aef0da4fd3a8681ab1b
2014-09-05 13:43:27 -07:00
Sreeram Ramachandran
ef12884da7 Unescape strings properly in NsdService.
NativeDaemonEvent.unescapeArgs() was improperly skipping the terminating
quote in cases like "\\", where the char preceding the quote is a
backslash, but the backslash itself is escaped, so the quote is indeed
an unescaped terminator.

unescapeArgs() doesn't unescape "\xxx" decimal escapes used by mDNS, so
fix NsdService to do that sort of unescaping explicitly (which is only
applicable when it receives a "fullname", in SERVICE_RESOLVED).

Bug: 16983542
Bug: 16986203

Change-Id: Idfa79749336c68424d961bc414f984c525b7e5e6
2014-09-05 20:31:46 +00:00
Alan Viverette
831bc0c9cc am c70c59e5: Merge "Remove old setTint from Drawable" into lmp-dev
* commit 'c70c59e5346fbe740db402df3ebb7ab6eef330e6':
  Remove old setTint from Drawable
2014-09-05 20:15:42 +00:00
Alan Viverette
a3e49a4b1d Propagate drawable hotspots when duplicate parent state is enabled
Makes hotspot-centered ripples "just work" everywhere that old-style
pressed states work.

BUG: 17407652
Change-Id: Id4802662aea537959122f029e85aa576cf51b641
2014-09-05 13:10:12 -07:00
Alan Viverette
f2f3bde62f Merge "Remove old setTint from Drawable" into lmp-dev 2014-09-05 20:06:02 +00:00
Michael Wright
59f709836c am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
* commit 'd2300a5972a9bb3e7530302cbf1a52550618bad9':
  Allow for event dispatching when in non-interactive states.
2014-09-05 20:04:01 +00:00
Michael Wright
a6863ad622 Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 2014-09-05 19:58:12 +00:00
RoboErik
372c1b1eb1 am 509d0b4e: Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev
* commit '509d0b4e3b65e737a4105d42138cc01306ff24b0':
  send volume button events to adjustSuggestedStream instead of adjustStream
2014-09-05 19:53:45 +00:00
RoboErik
c16c4a6d2a am 545fdfe1: Merge "Minor tweaks to MediaBrowser" into lmp-dev
* commit '545fdfe1a7d215054b16ee83cf050b4ac22e779a':
  Minor tweaks to MediaBrowser
2014-09-05 19:53:42 +00:00
RoboErik
ad65c13916 am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev
* commit '52dcc8a1dbd3e48e65253fa82b35bceb8428da75':
  rename add/removeCallback to register/unregisterCallback
2014-09-05 19:53:38 +00:00
RoboErik
8e53a69f48 am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev
* commit 'fa8c8c3a9488bd65e9729bbf9b98acbe55ade15a':
  rename SERVICE_ACTION to SERVICE_INTERFACE
2014-09-05 19:53:34 +00:00
Amith Yamasani
0b4c65f577 am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev
* commit '221281ce8bf1a1c99806ca4cd6137e7b77fd82a3':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
2014-09-05 19:53:30 +00:00
RoboErik
77a634503f Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 2014-09-05 19:49:56 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
Amith Yamasani
4b278afa0d Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 2014-09-05 19:43:44 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
2014-09-05 12:43:11 -07:00
Michael Wright
f195dca3a1 am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev
* commit 'e252525f6fda8dad56566d78a4881ab35778e9a6':
  Add extra to ASSIST intent to indicate potential input type
2014-09-05 19:42:54 +00:00
RoboErik
272e161c1a send volume button events to adjustSuggestedStream instead of adjustStream
This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
2014-09-05 12:37:39 -07:00
Michael Wright
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Amit Mahajan
d096b8c061 am 2713311d: Merge "Add gid to configure no_ems_support_sim_operators" into lmp-dev
* commit '2713311d60310b85e00a6e057ff47465e93dfa44':
  Add gid to configure no_ems_support_sim_operators
2014-09-05 19:32:01 +00:00
Amit Mahajan
5e615d8e6b am d494e6cb: Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev
* commit 'd494e6cb1e61da0250261b7cdb76dd791c0c9571':
  Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu
2014-09-05 19:31:58 +00:00
Amit Mahajan
597827e460 Merge "Add gid to configure no_ems_support_sim_operators" into lmp-dev 2014-09-05 19:25:49 +00:00
Amit Mahajan
f11b43d8bf Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev 2014-09-05 19:25:36 +00:00
Alan Viverette
bd5afc7186 Remove old setTint from Drawable
BUG: 15782973
Change-Id: Idf0a6ea7c81135b032fcdadc46ee78d7db6945c7
2014-09-05 12:23:18 -07:00
Alan Viverette
a3f0c2b21a Simplify ripple background drawing, fix ripple alphas
Eliminates an extra saveLayer on the background in the common case of
a rectangle-bounded ripple.

Ripples and backgrounds are now drawn at 50% opacity of the ripple
color, which ensures that both the ripple and background are visible
and that the pressed state has a correct combined alpha.

Also fixes a bug where hardware (RT) animation was getting turned off
prematurely.

BUG: 17405007
BUG: 17398089
BUG: 17394445
BUG: 17389859
Change-Id: Idb5808368fe563581a51a8cb9778275ee8d22f4c
2014-09-05 19:15:44 +00:00
George Mount
21f54f3940 Only call setHasTransientState in captureHierarchy.
Bug 17390936

Change-Id: I1a8cdc2820b53f6ca9f6edc41a7e87f45bea7811
2014-09-05 12:13:49 -07:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
2014-09-05 12:11:48 -07:00