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

79051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
c0ed6efe5f am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah 
* commit '115284bc124ce2874f32ad36956f475959513388':
  Support volume-changed sounds on master-volume-only configs
 2012-05-25 11:57:35 -07:00
Christopher Tate
115284bc12 Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah 2012-05-25 11:55:04 -07:00
Romain Guy
3450dfa7dd am 6da3e987: am bc1387b1: Merge "Tale of status bar on crespo, part 2 Bug #6541079" into jb-dev 
* commit '6da3e987124c4190ff959136cf9fab325b3d5194':
  Tale of status bar on crespo, part 2 Bug #6541079
 2012-05-25 11:50:00 -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
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
Irfan Sheriff
f9b84a636c am 1442a932: am da87c7c1: Merge "Fix delayed wifi shutdown" into jb-dev 
* commit '1442a932fffa102057164085106d3b3f41906014':
  Fix delayed wifi shutdown
 2012-05-25 10:39:23 -07:00
Romain Guy
29bc3fb560 am bb996743: am 53210964: Merge "Tale of status bar on crespo, part 1 Bug #6541079" into jb-dev 
* commit 'bb99674374dcf2058cfcff202062bb2e67745ed8':
  Tale of status bar on crespo, part 1 Bug #6541079
 2012-05-25 10:35:52 -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
0926424028 am 314745cd: am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev 
* commit '314745cd5661db8672505ec753a6f88b9e80e609':
  Better support for HTML5 audio loop.
 2012-05-25 10:18:09 -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
Jean-Baptiste Queru
4b33266935 am c6df8417: am 541803cc: am fd63c857: Merge "Wipe the user data out in any case." 
* commit 'c6df8417eaf60f80b2741ec29e8188324de95af3':
  Wipe the user data out in any case.
 2012-05-25 08:17:49 -07: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
Amith Yamasani
fe33aa6f1e am c5be9ced: am d2f4d60e: (-s ours) am d4cb08df: Merge "FileInputStream is not closed in "UserManager.java : readUserList()"" 
* commit 'c5be9ced9f07a56a0e273fc322001231228811db':
  FileInputStream is not closed in "UserManager.java : readUserList()"
 2012-05-25 07:36:00 -07:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Amith Yamasani
c5be9ced9f am d2f4d60e: (-s ours) am d4cb08df: Merge "FileInputStream is not closed in "UserManager.java : readUserList()"" 
* commit 'd2f4d60edff4892dd0e17f9a0244597782e3c12a':
  FileInputStream is not closed in "UserManager.java : readUserList()"
 2012-05-25 07:29:39 -07:00
Chris Wren
adde6eb394 am af948894: am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev 
* commit 'af948894195d2af09295210d4266bb45c4f4ba9e':
  Squelch the logs from SizeAdaptiveLayout.
 2012-05-25 06:27:45 -07:00
Chris Wren
af94889419 am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev 
* commit '04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
  Squelch the logs from SizeAdaptiveLayout.
 2012-05-25 06:24:12 -07:00
Chris Wren
04b63f6fb0 Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev 2012-05-25 06:21:56 -07:00
Vishal Mahaveer
f48fb85a8c Fix delayed wifi shutdown 
Use a wake up alarm to ensure delayed shut down message is sent

Bug: 5926285
Change-Id: I26a3353ddabb17d55299d8b5f9faf4c7ef5b2448
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-05-24 22:49:58 -07:00
Romain Guy
f7f16f7f3f Tale of status bar on crespo, part 1 
Bug #6541079

In which ghosts are more desirable than standing soldiers.

Change-Id: I92ec33fa344938eabe5adf6644683c7ab19ba8a5
 2012-05-24 19:23:12 -07:00
Jim Miller
213efc48e4 am 98b9221a: am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev 
* commit '98b9221a903796aab9615526105a51b4386a078c':
  Fix 6535413: Fix overlapping controls in keyguard
 2012-05-24 18:51:08 -07:00
Jim Miller
98b9221a90 am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev 
* commit 'c7f82cc7fd2b747284da692f73ea7f09b0db9099':
  Fix 6535413: Fix overlapping controls in keyguard
 2012-05-24 18:48:02 -07:00
Jim Miller
c7f82cc7fd Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev 2012-05-24 18:45:24 -07:00
Jean-Michel Trivi
3266873f7f am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
  Unhide KeyguardManager locked and secure state getters
 2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
b3db8dc9f1 am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
  Unhide KeyguardManager locked and secure state getters
 2012-05-24 18:29:39 -07:00
Jim Miller
55c6e82883 Fix 6535413: Fix overlapping controls in keyguard 
It appears that rendering order changed in recent builds.  The
transport control used to work in HC and ICS.  In any case, the fix
is to swap the positions of the two widgets, which ensures the
transport control appears on top of the status area.

Change-Id: I312d0a83e7bebbdc57f037e732e371538a781e86
 2012-05-24 18:28:31 -07:00
Jean-Michel Trivi
97594d6cea Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 2012-05-24 18:27:37 -07:00
John Grossman
aa4aacad9f am 03f2fb3c: (-s ours) AAH_RX: Add the ability to control volume and stream type. 
* commit '03f2fb3cb9b045545d9a9abbaa37cf98a25cb67e':
  AAH_RX: Add the ability to control volume and stream type.
 2012-05-24 18:27:19 -07:00
John Reck
fcf4c34545 am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
  Support skipping a touch stream due to lack of handlers
 2012-05-24 18:18:07 -07:00
John Reck
731327a93a am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 
* commit 'f738810247b887082dbf4ca3a867f8d9e1955001':
  Support skipping a touch stream due to lack of handlers
 2012-05-24 18:13:52 -07:00
John Reck
f738810247 Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 2012-05-24 18:11:36 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters 
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
 2012-05-24 18:09:44 -07:00
Jim Miller
9a1a3ab84e am 4414bdef: am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev 
* commit '4414bdefe1ac1559f2c4d2658a28ed80abc84482':
  Fix 6547012: ignore events outside the home/back/recent navigation area
 2012-05-24 17:59:54 -07:00
Craig Mautner
609c6e331b am 013772f2: am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev 
* commit '013772f2d6f0a0aec96b90a768ff198a27289eac':
  Redraw all windows earlier in power on sequence.
 2012-05-24 17:56:30 -07:00
Jim Miller
4414bdefe1 am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev 
* commit '73bde11e624c44620819e9c93a61ca6be6e96997':
  Fix 6547012: ignore events outside the home/back/recent navigation area
 2012-05-24 17:56:02 -07:00
Craig Mautner
013772f2d6 am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev 
* commit '2af7b9151f8df3581e38847ac711185426df5dea':
  Redraw all windows earlier in power on sequence.
 2012-05-24 17:52:23 -07:00
Jim Miller
73bde11e62 Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev 2012-05-24 17:51:10 -07:00
Craig Mautner
2af7b9151f Merge "Redraw all windows earlier in power on sequence." into jb-dev 2012-05-24 17:48:44 -07:00
John Grossman
03f2fb3cb9 AAH_RX: Add the ability to control volume and stream type. 
DO NOT MERGE

Change the AAH_RX player so that it implements MediaPlayerHWInterface
(instead of just MediaPlayerInterface) so the app level can control
the rendering volume of individual RX player instances as well as the
stream type of the audio tracks created by the RX player.

Change-Id: Ieff1ea774f7981227546744883ee4b4e87a2cd2a
Signed-off-by: John Grossman <johngro@google.com>
 2012-05-24 17:48:17 -07:00
Christopher Tate
c4b78d206f Support volume-changed sounds on master-volume-only configs 
Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted.  This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.

Bug 6498986

Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
 2012-05-24 17:30:39 -07:00
Jim Miller
960892c0af Fix 6547012: ignore events outside the home/back/recent navigation area 
This fixes the search panel to only show if touch events originate
in the home/back/recent area.

Change-Id: I370da8b5c5613b7bbab5d266ba51a61df8f3a57b
 2012-05-24 17:02:31 -07:00
Wink Saville
fe002daf4a am 039e4d3d: am 02a43d3a: Merge "Add debug for tracking down connectivity issues." into jb-dev 
* commit '039e4d3dcc9478ac406478f061c3dacff6943321':
  Add debug for tracking down connectivity issues.
 2012-05-24 16:10:33 -07:00
Wink Saville
039e4d3dcc am 02a43d3a: Merge "Add debug for tracking down connectivity issues." into jb-dev 
* commit '02a43d3adf8a0b43503f5e266ca332fc1ba23ccc':
  Add debug for tracking down connectivity issues.
 2012-05-24 16:07:18 -07:00
Wink Saville
02a43d3adf Merge "Add debug for tracking down connectivity issues." into jb-dev 2012-05-24 16:05:18 -07:00