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

78153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
fc9c4434da am 48c22c84: Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 
* commit '48c22c84c089213dda6495fbdeb384e400c7c5c5':
  Adding debugging code for bug where recycled views still had parent
 2012-05-29 08:44:31 -07:00
Michael Jurka
48c22c84c0 Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 2012-05-29 08:41:49 -07:00
Danielle Millett
d965019105 am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 
* commit '45973d6d19eb9329d77e62004e80f63f111a27e5':
  Moved setting the flag to suppress face unlock during a phone call
 2012-05-29 06:27:14 -07:00
Danielle Millett
45973d6d19 Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 2012-05-29 06:24:05 -07:00
Michael Jurka
b2a5d9e546 Adding debugging code for bug where recycled views still had parent 
Bug: 6499508
Change-Id: Iaf95ee6a0836c5f1e863d6a5b969e032d36a2b27
 2012-05-29 03:44:18 -07:00
Bryan Mawhinney
592a3f5447 am c3a5cf9a: Actually set the video scaling mode :-) 
* commit 'c3a5cf9aab3d409445accb2a93c09e6b4140d196':
  Actually set the video scaling mode :-)
 2012-05-27 12:50:40 -07:00
Bryan Mawhinney
c3a5cf9aab Actually set the video scaling mode :-) 
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
 2012-05-27 17:42:46 +01:00
Romain Guy
59893daa50 am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 
* commit 'bbedfa0036f8de393c05b2ad981695ae74e7ab42':
  Tale of status bar on crespo, part 3 Bug #6541079
 2012-05-25 19:23:48 -07:00
Romain Guy
bbedfa0036 Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 2012-05-25 19:21:49 -07:00
Jeff Brown
9026fecd51 am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev 
* commit 'd4cf7e7b06e6870d447dbed2683b8849cfe5336b':
  Don't ANR on hover, scroll or if a window goes away.
 2012-05-25 18:41:20 -07:00
Jeff Brown
d4cf7e7b06 Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev 2012-05-25 18:38:24 -07:00
Chet Haase
9d8933ec11 am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev 
* commit 'a27551dde853733e89aa16b6fb096186b08c5d81':
  Make Google search panel go away when receiving phone call
 2012-05-25 15:52:01 -07:00
John Reck
2611f1eced am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:51:58 -07:00
Chet Haase
a27551dde8 Merge "Make Google search panel go away when receiving phone call" into jb-dev 2012-05-25 15:49:47 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
Irfan Sheriff
7d16bf4085 am e2417b7a: Merge "Retain device during connecting state" into jb-dev 
* commit 'e2417b7a6ef2ba539be70574fe7c9e1af4810dd4':
  Retain device during connecting state
 2012-05-25 15:15:32 -07:00
Irfan Sheriff
e2417b7a6e Merge "Retain device during connecting state" into jb-dev 2012-05-25 15:13:27 -07:00
Brandon Keely
c3750d068c am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 
* commit '3ef8dd2b399109c2c9b05ea24315bcc2e0ba8df2':
  For 720dp devices, less motion during task-to-task transition.
 2012-05-25 14:41:52 -07:00
Brandon Keely
3ef8dd2b39 Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 2012-05-25 14:38:47 -07:00
Eric Fischer
edabf9c75e am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'dfaadf9dae65e4e3cee7430908c98614bb208d20':
  Import translations. DO NOT MERGE
 2012-05-25 14:28:07 -07:00
Eric Fischer
dfaadf9dae Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:24:44 -07:00
Eric Fischer
085e879629 am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'aed9b810a538fa02cc5f104e29841c90977ebeaa':
  Import translations. DO NOT MERGE
 2012-05-25 14:18:47 -07:00
Eric Fischer
aed9b810a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:14:55 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer 
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
 2012-05-25 14:02:26 -07:00
Fabrice Di Meglio
b354f987d3 am d5f3798d: Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 
* commit 'd5f3798d6b5cc6404aa03396b440b56415f00ca8':
  Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
 2012-05-25 13:52:46 -07:00
Fabrice Di Meglio
d5f3798d6b Merge "Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev 2012-05-25 13:49:39 -07:00
Chet Haase
ff20b0c0ef Make Google search panel go away when receiving phone call 
Issue #6557847 "Google" launcher icon stuck in ring slider after getting incoming call

Change-Id: If77f66fd241af7fbfe6228498b07fd1cfcef36bd
 2012-05-25 13:38:10 -07:00
Eric Fischer
b80d834ca0 Import translations. DO NOT MERGE 
Change-Id: I893c25a4fd206d9b0c018c44e4441ef36d12eed0
 2012-05-25 13:32:45 -07:00
Fabrice Di Meglio
4d0d38b9f4 Fix bug #6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key 
- close Recent Apps before launching the Assistant

Change-Id: I823dc254252fb3c1fde0a3adcfb895e368c7d77e
 2012-05-25 13:14:02 -07:00
Eric Fischer
02f03668f8 Import translations. DO NOT MERGE 
Change-Id: I3528164ed7d96f571cf31df0715100da5120b082
 2012-05-25 13:11:43 -07:00
Irfan Sheriff
9cb980422a Retain device during connecting state 
With join taking much longer, sometimes device can be lost from supplicant.
Retain device to complete connection.

Also, clear up stale peer data after find stops during inactive state.

Bug: 6557725
Change-Id: I15b92e50a837481f974034b1ea7b32c8abee969e
 2012-05-25 12:52:34 -07:00
Gilles Debunne
1cf99631ca am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev 
* commit '18afc622c3d80713a6ffb91792cce399e1715bfb':
  Fix for IOOB in SearchView
 2012-05-25 12:46:09 -07:00
Gilles Debunne
18afc622c3 Merge "Fix for IOOB in SearchView" into jb-dev 2012-05-25 12:43:39 -07:00
Jean-Baptiste Queru
b5ac97c5a8 am 735470d2: (-s ours) am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 
* commit '735470d202cd42fe8b65f0fb0d6c38aff2be967e':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
 2012-05-25 12:27:05 -07:00
Romain Guy
8900e63194 Tale of status bar on crespo, part 3 
Bug #6541079

The vanished shall not be forgotten.

Change-Id: If01a53d8c203ef82e54d0b440063a8dbebe7b14a
 2012-05-25 12:08:39 -07:00
Romain Guy
6da3e98712 am bc1387b1: Merge "Tale of status bar on crespo, part 2 Bug #6541079" into jb-dev 
* commit 'bc1387b11c530a751c1c6075d16cac2e48a4b932':
  Tale of status bar on crespo, part 2 Bug #6541079
 2012-05-25 11:45:55 -07:00
Romain Guy
bc1387b11c Merge "Tale of status bar on crespo, part 2 Bug #6541079" into jb-dev 2012-05-25 11:43:13 -07:00
Jean-Baptiste Queru
735470d202 am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 
* commit '23cad6eb2b42f023a8f2197cd358de87f9084b99':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
 2012-05-25 11:34:02 -07:00
Romain Guy
648342f1f2 Tale of status bar on crespo, part 2 
Bug #6541079

In which a flood destroys flatland.

Change-Id: Ifd1913b645c08531b221b3e010c133f14bcfb0c2
 2012-05-25 10:44:45 -07:00
Jean-Baptiste Queru
23cad6eb2b Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 2012-05-25 10:38:06 -07:00
Irfan Sheriff
1442a932ff am da87c7c1: Merge "Fix delayed wifi shutdown" into jb-dev 
* commit 'da87c7c1eea9a054fd6842995df115113228191d':
  Fix delayed wifi shutdown
 2012-05-25 10:35:44 -07:00
Romain Guy
bb99674374 am 53210964: Merge "Tale of status bar on crespo, part 1 Bug #6541079" into jb-dev 
* commit '53210964673640166c8824c580344b06e8f8e28c':
  Tale of status bar on crespo, part 1 Bug #6541079
 2012-05-25 10:31:53 -07:00
Irfan Sheriff
da87c7c1ee Merge "Fix delayed wifi shutdown" into jb-dev 2012-05-25 10:31:46 -07:00
Romain Guy
5321096467 Merge "Tale of status bar on crespo, part 1 Bug #6541079" into jb-dev 2012-05-25 10:28:01 -07:00
Teng-Hui Zhu
314745cd56 am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev 
* commit '65e08329ee57f2c4cda679885db700ceaca6c842':
  Better support for HTML5 audio loop.
 2012-05-25 10:13:08 -07:00
Teng-Hui Zhu
65e08329ee Merge "Better support for HTML5 audio loop." into jb-dev 2012-05-25 10:10:11 -07:00
Martin Storsjo
9af8cfa60f stagefright aacenc: Fix reading out of bounds in pow2_xy 
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.

Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
 2012-05-25 19:49:59 +03:00
Jean-Baptiste Queru
c6df8417ea am 541803cc: am fd63c857: Merge "Wipe the user data out in any case." 
* commit '541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
  Wipe the user data out in any case.
 2012-05-25 08:13:03 -07:00
Jean-Baptiste Queru
541803ccc5 am fd63c857: Merge "Wipe the user data out in any case." 
* commit 'fd63c85742f4b12065418d48ae10be4bb12468f5':
  Wipe the user data out in any case.
 2012-05-25 08:09:39 -07:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00