drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,146 Commits 1 Branch 0 Tags
Commit Graph

114146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
5148e89356 Merge "Animate state change for Switch" 2013-09-18 00:21:26 +00:00
Mindy Pereira
788abe8fe0 am 2fed38ec: am 09804e41: Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev 
* commit '2fed38ec137108564e7cd53805ea716e4ea39a3b':
  Add isQuickScaleEnabled to ScaleGestureDetector
 2013-09-17 17:03:24 -07:00
Alan Viverette
cc2688d18a Animate state change for Switch 
Change-Id: Ie8fdbb323b95ee1bd573a0ab452857a277de34bf
 2013-09-17 17:00:12 -07:00
Mindy Pereira
2fed38ec13 am 09804e41: Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev 
* commit '09804e41daa31f95a6050892866b24eea32eb4cf':
  Add isQuickScaleEnabled to ScaleGestureDetector
 2013-09-17 17:00:10 -07:00
Mindy Pereira
09804e41da Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev 2013-09-17 23:57:54 +00:00
Matthew Xie
9c1109fa07 am 1d47f003: am c9d1d5f3: Adjust absolute volume only when the device is streaming music 
* commit '1d47f0033b8d46ec476c9e5985f6ce913d4a63aa':
  Adjust absolute volume only when the device is streaming music
 2013-09-17 16:55:21 -07:00
Matthew Xie
1d47f0033b am c9d1d5f3: Adjust absolute volume only when the device is streaming music 
* commit 'c9d1d5f35091226e96fcfa91817480f589eb36e2':
  Adjust absolute volume only when the device is streaming music
 2013-09-17 16:53:13 -07:00
Matthew Xie
c9d1d5f350 Adjust absolute volume only when the device is streaming music 
The device has to be A2DP device
Remove AudioManager#avrcpUpdateVolume
bug 10681804

Change-Id: I2bc85e48fdff374638b984af593c6f1c4ddd3ee6
 2013-09-17 23:48:19 +00:00
Craig Mautner
5b35bab44a am 2af9dd71: am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev 
* commit '2af9dd716ec117af602b86c0d26cc40eb733338e':
  Add bounds checks before accessing ArrayList.
 2013-09-17 16:18:15 -07:00
Craig Mautner
2af9dd716e am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev 
* commit '019f8cb8a78c5584618655f5478d9a9f3dedc3f0':
  Add bounds checks before accessing ArrayList.
 2013-09-17 16:15:20 -07:00
Craig Mautner
019f8cb8a7 Merge "Add bounds checks before accessing ArrayList." into klp-dev 2013-09-17 23:13:31 +00:00
Craig Mautner
dccb770b84 Add bounds checks before accessing ArrayList. 
Add a test for emptiness before accessing either mTaskHistory[0] or
TaskRecord.mActivities[0]. This will keep us from hitting
IndexOutOfBoundsException.

Fixes bug 10789624.

Change-Id: If726df888a2c8b393788793b6220a6bffe2df883
 2013-09-17 15:53:34 -07:00
Jeff Sharkey
c697e6c84a am cf4052f6: am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev 
* commit 'cf4052f6b519dd5720a08d2e42ccb8b23af018ea':
  Guard against null Context in attachInfo().
 2013-09-17 15:44:48 -07:00
Jeff Sharkey
cf4052f6b5 am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev 
* commit 'e48569a87057e46a30d3dcbb2d788a4e4da7f21c':
  Guard against null Context in attachInfo().
 2013-09-17 15:40:56 -07:00
Jean-Michel Trivi
d5ed25f805 am 144835ae: am f03ceff2: Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 
* commit '144835aef8045039ea303bd7d7f03114aea21935':
  Revise new public API for ratings in RemoteControlClient
 2013-09-17 15:40:54 -07:00
Jeff Sharkey
e48569a870 Merge "Guard against null Context in attachInfo()." into klp-dev 2013-09-17 22:38:18 +00:00
Jean-Michel Trivi
144835aef8 am f03ceff2: Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 
* commit 'f03ceff2f506133a238848c2f5db4322285cc2b7':
  Revise new public API for ratings in RemoteControlClient
 2013-09-17 15:37:19 -07:00
Jean-Michel Trivi
f03ceff2f5 Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 2013-09-17 22:35:08 +00:00
Jeff Sharkey
10cb312ecd Guard against null Context in attachInfo(). 
Some CTS tests were running into this.

Bug: 10805216
Change-Id: I425d2a0064612af70a64f457e159498cb6257a28
 2013-09-17 15:18:43 -07:00
David Braun
a2ee725744 am fdacf747: am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev 
* commit 'fdacf74764ed42b6550cefa0306621200517b36e':
  Implement new method for handling SMS/MMS on the platform
 2013-09-17 15:18:13 -07:00
Craig Mautner
a4ac9a3ac4 am e0dcb7df: am bc65c1db: Merge "Do not assign InputMethod to non-input windows." into klp-dev 
* commit 'e0dcb7df5206d283b29054f3e9d3da9732b27935':
  Do not assign InputMethod to non-input windows.
 2013-09-17 15:18:07 -07:00
David Braun
fdacf74764 am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev 
* commit '345d491b77d70942f7a4390645fae7748b418459':
  Implement new method for handling SMS/MMS on the platform
 2013-09-17 15:15:44 -07:00
Craig Mautner
e0dcb7df52 am bc65c1db: Merge "Do not assign InputMethod to non-input windows." into klp-dev 
* commit 'bc65c1dbccfe936856e9a2c4066c1ec9115140e2':
  Do not assign InputMethod to non-input windows.
 2013-09-17 15:15:41 -07:00
David Braun
345d491b77 Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev 2013-09-17 22:14:54 +00:00
Craig Mautner
bc65c1dbcc Merge "Do not assign InputMethod to non-input windows." into klp-dev 2013-09-17 22:13:10 +00:00
Jean-Michel Trivi
88183e67d4 Revise new public API for ratings in RemoteControlClient 
Refactor RemoteControlClient.MetadataEditor to move functionality
 in new abstract class MediaMetadataEditor, so it can be also
 used on the "display" side of the RemoteControl functionality.
Compatibility of these changes has been tested against
 existing Play applications which use the RemoteControlClient API.

Move the new constants and method definitions related to the
 ratings feature to MediaMetadataEditor. This changes the
 yet-to-be-published ratings API, so this doesn't break
 compatibility.
Rating feature is handled by the new Rating class with a set
 of constructors that handle the different rating models.

Bug 8440498

Change-Id: I9b6dc2204bfc48594bad5cd6449d357f8a485da0
 2013-09-17 15:13:00 -07:00
Svetoslav
2abc1251f0 am 10d44a76: am a245a4f1: Merge "Update the APIs to fix the build" into klp-dev 
* commit '10d44a762e63d02c403a35c4f112dc8f5aabf94b':
  Update the APIs to fix the build
 2013-09-17 15:03:34 -07:00
Brian Colonna
85b11b6ec9 am 6d9b6bee: am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 
* commit '6d9b6beedcac132ae5f81ad561c2f11048a58da7':
  Fix 10550373: Stopping FUL when emergency dialer opens
 2013-09-17 15:03:31 -07:00
Svetoslav
10d44a762e am a245a4f1: Merge "Update the APIs to fix the build" into klp-dev 
* commit 'a245a4f14ed9e477ce1c68b54bf14a745d7caf47':
  Update the APIs to fix the build
 2013-09-17 15:01:08 -07:00
Brian Colonna
6d9b6beedc am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 
* commit '4811398bfdaf4cf07f945c46d15977fd7418f498':
  Fix 10550373: Stopping FUL when emergency dialer opens
 2013-09-17 15:01:06 -07:00
Svetoslav
a245a4f14e Merge "Update the APIs to fix the build" into klp-dev 2013-09-17 21:58:35 +00:00
Brian Colonna
4811398bfd Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 2013-09-17 21:58:05 +00:00
Svetoslav
e15aa126df Update the APIs to fix the build 
Change-Id: I1204fb2dff9e2db187e78cd6cfdc3c94650c1d86
 2013-09-17 14:55:35 -07:00
Craig Mautner
22b9a5e0aa Do not assign InputMethod to non-input windows. 
The InputMethod window was being assigned to the bottommost
window as a fall-through situation when no window could receive
input. This fix changes that so that if the bottommost window
cannot receive IME input then the InputMethod will be unassigned.

In most ANRs associated with bug 10689184 mInputMethodTarget
was assigned to the Wallpaper window and the InputMethod was
placed directly above it. When the ANR occurred the window that
was awaiting focused was then always placed immediately above the
InputMethod. This fix will keep that situation from happening.

Change-Id: Ic247e8132a907f2712a9f8a89e43c099142ec851
 2013-09-17 14:50:56 -07:00
Brian Colonna
7fce380216 Fix 10550373: Stopping FUL when emergency dialer opens 
Face Unlock wasn't being stopped when the emergency dialer opened,
causing FUL to flash briefly after the emergency dialer appeared.
This was most noticeable on Hammerhead devices.

This change allows EmergencyButton to stop FUL by way of
KeyguardUpdateMonitor.  Note that it must stop FUL immediately rather
than going through a handler.  If going through a handler FUL is not
stopped in time to prevent the issue.

Change-Id: I3985969a19e909e2633d7876a3fb2d34c70e2cc1
 2013-09-17 17:33:21 -04:00
Alan Viverette
379c21518a Merge "Fix default style attr in DialogPreference subclass constructors" 2013-09-17 21:19:45 +00:00
Michael Jurka
1c7a180f3c am c23762ec: am 4c8cc720: Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 
* commit 'c23762ecd6efff066ed195f3db8dad27972035a1':
  Fix black bar drawn sometimes when swiping away items in Recents
 2013-09-17 14:02:43 -07:00
Michael Jurka
c23762ecd6 am 4c8cc720: Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 
* commit '4c8cc720e79f01840800bd0a6dd611d179acdbed':
  Fix black bar drawn sometimes when swiping away items in Recents
 2013-09-17 13:59:39 -07:00
Michael Jurka
4c8cc720e7 Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 2013-09-17 20:54:04 +00:00
Adam Powell
34155c49a5 am f35621da: am 70aafea9: Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 
* commit 'f35621da26346e434d8144e5280707bddbdd5bff':
  Action bar transitions - handle expanding/collapsing action views
 2013-09-17 13:52:32 -07:00
Svetoslav
417787d374 am 70201a53: am 0cfebec5: Merge "Print pooler crashes for some page ranges." into klp-dev 
* commit '70201a53f4b38a655ce70b1530b0c40d76e8e37f':
  Print pooler crashes for some page ranges.
 2013-09-17 13:52:29 -07:00
Svetoslav Ganov
ad7220558c am 5d4f6871: am 22d2575c: Merge "Adding more standard media sizes." into klp-dev 
* commit '5d4f6871258260eded42adf55198fa499ebf7919':
  Adding more standard media sizes.
 2013-09-17 13:52:26 -07:00
Adam Powell
f35621da26 am 70aafea9: Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 
* commit '70aafea91eedc70039818912007f43208e656240':
  Action bar transitions - handle expanding/collapsing action views
 2013-09-17 13:49:33 -07:00
Svetoslav
70201a53f4 am 0cfebec5: Merge "Print pooler crashes for some page ranges." into klp-dev 
* commit '0cfebec522539722f294a99bc32437b5d9e4b27d':
  Print pooler crashes for some page ranges.
 2013-09-17 13:49:31 -07:00
Svetoslav Ganov
5d4f687125 am 22d2575c: Merge "Adding more standard media sizes." into klp-dev 
* commit '22d2575c3eb5e2154bcb344372711bafc2e0b3d3':
  Adding more standard media sizes.
 2013-09-17 13:49:28 -07:00
Santos Cordon
8a4577a169 am deae1e11: am b00e5cc6: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'deae1e11bf9d6ee40e70bee62d24dbcb01ef1b60':
  Add permissions for the InCallUI Split.
 2013-09-17 13:48:46 -07:00
Adam Powell
70aafea91e Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 2013-09-17 20:47:08 +00:00
Svetoslav
0cfebec522 Merge "Print pooler crashes for some page ranges." into klp-dev 2013-09-17 20:46:35 +00:00
Svetoslav Ganov
22d2575c3e Merge "Adding more standard media sizes." into klp-dev 2013-09-17 20:46:22 +00:00
Santos Cordon
deae1e11bf am b00e5cc6: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'b00e5cc610f24aca7e989db0ca552c952d2a924f':
  Add permissions for the InCallUI Split.
 2013-09-17 13:45:58 -07:00