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

75654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
5010e2df40 am e9a76b52: am c098198e: Merge "system and UI sounds volume policy" into jb-dev 
* commit 'e9a76b528145d3794678379fdbbb6e3c4d6e801b':
  system and UI sounds volume policy
 2012-04-27 08:55:55 -07:00
Eric Laurent
e9a76b5281 am c098198e: Merge "system and UI sounds volume policy" into jb-dev 
* commit 'c098198eb37974ef117d3d5f0d07fb19ead036dc':
  system and UI sounds volume policy
 2012-04-27 08:51:33 -07:00
Eric Laurent
c098198eb3 Merge "system and UI sounds volume policy" into jb-dev 2012-04-27 08:48:51 -07:00
Daniel Sandler
12b048873e am db11a4ed: am 2c9ae753: Finally, fix the teensy back button in landscape. 
* commit 'db11a4ed77a437e78825eff2ea6ca326f7c7ab29':
  Finally, fix the teensy back button in landscape.
 2012-04-27 07:21:23 -07:00
Daniel Sandler
db11a4ed77 am 2c9ae753: Finally, fix the teensy back button in landscape. 
* commit '2c9ae7538819b77c8814217b93a6ef0bf417854a':
  Finally, fix the teensy back button in landscape.
 2012-04-27 07:18:38 -07:00
Daniel Sandler
2c9ae75388 Finally, fix the teensy back button in landscape. 
Bug: 5993561 (and friends)
Change-Id: I0ccde54ea145e945f1a02d0480585c32cd129911
 2012-04-27 10:15:16 -04:00
Daniel Sandler
57c94423d9 am cd2e6281: am c2ee231b: Merge "Lights out improvements." into jb-dev 
* commit 'cd2e6281cb40e2667791fecff6b9517e057d2029':
  Lights out improvements.
 2012-04-27 05:01:13 -07:00
Daniel Sandler
cd2e6281cb am c2ee231b: Merge "Lights out improvements." into jb-dev 
* commit 'c2ee231b5e55f2a6914de2fe7fa3324c9d0aa4ed':
  Lights out improvements.
 2012-04-27 04:58:18 -07:00
Daniel Sandler
c2ee231b5e Merge "Lights out improvements." into jb-dev 2012-04-27 04:56:08 -07:00
Steve Block
d8ac8b05a6 am a4dcc774: am 7e279bc9: Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 
* commit 'a4dcc77422ca47dc279681cfe539b03315d91755':
  Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()
 2012-04-27 03:29:04 -07:00
Steve Block
a4dcc77422 am 7e279bc9: Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 
* commit '7e279bc91ae1d9a59f00724a2c28ab840bd73423':
  Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()
 2012-04-27 03:26:06 -07:00
Steve Block
7e279bc91a Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 2012-04-27 03:19:04 -07:00
Ben Murdoch
8532a30ce8 am 3d8678f8: am c6911d47: Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 
* commit '3d8678f8b1ef698369c350049352659793f404d1':
  Create WebViewDatabaseClassic from WebViewDatabase.
 2012-04-27 01:45:01 -07:00
Ben Murdoch
3d8678f8b1 am c6911d47: Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 
* commit 'c6911d47d193d76a40938f56854ca06c00edab68':
  Create WebViewDatabaseClassic from WebViewDatabase.
 2012-04-27 01:42:43 -07:00
Ben Murdoch
c6911d47d1 Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 2012-04-27 01:39:59 -07:00
Pannag Sanketi
bffc943ba7 am 014ad999: am b33c34cc: Merge "Resolving the black screen / crash in effects" into jb-dev 
* commit '014ad99997c38f3793a4e30de7c234ce6093a511':
  Resolving the black screen / crash in effects
 2012-04-26 22:38:43 -07:00
Pannag Sanketi
014ad99997 am b33c34cc: Merge "Resolving the black screen / crash in effects" into jb-dev 
* commit 'b33c34cc25263647e0270ab92cb7fdb5af79416c':
  Resolving the black screen / crash in effects
 2012-04-26 22:35:41 -07:00
Pannag Sanketi
b33c34cc25 Merge "Resolving the black screen / crash in effects" into jb-dev 2012-04-26 22:34:03 -07:00
Dianne Hackborn
0e0d7a7462 am de5c3359: am 73214f61: Merge "Fix launcher icon size for tvdpi." into jb-dev 
* commit 'de5c3359a643f9f289fda35fbb6219fdb6c21adf':
  Fix launcher icon size for tvdpi.
 2012-04-26 19:37:30 -07:00
Dianne Hackborn
de5c3359a6 am 73214f61: Merge "Fix launcher icon size for tvdpi." into jb-dev 
* commit '73214f619a824cf724ab8f60d8fc992aed6a70a6':
  Fix launcher icon size for tvdpi.
 2012-04-26 19:35:09 -07:00
Dianne Hackborn
73214f619a Merge "Fix launcher icon size for tvdpi." into jb-dev 2012-04-26 19:33:37 -07:00
Dianne Hackborn
eb08322953 am 4883d755: am 493f74e5: Merge "Add new Activity.finishAffinity() method." into jb-dev 
* commit '4883d755ebee295af57eb7294db0146db153b2a5':
  Add new Activity.finishAffinity() method.
 2012-04-26 19:31:13 -07:00
Dianne Hackborn
4883d755eb am 493f74e5: Merge "Add new Activity.finishAffinity() method." into jb-dev 
* commit '493f74e5a4ed948a72575d11840a8366b5e9f672':
  Add new Activity.finishAffinity() method.
 2012-04-26 19:27:49 -07:00
Dianne Hackborn
493f74e5a4 Merge "Add new Activity.finishAffinity() method." into jb-dev 2012-04-26 19:25:41 -07:00
Dianne Hackborn
d0356a19c1 Fix launcher icon size for tvdpi. 
We didn't have a case for tvdpi, so ended up in the default
scaling.  This resulting in us using 319 instead of 320.

Fixed the default case to round, and added explicit cases
for tvdpi since this is a standard density.

Change-Id: I752b924e1556af94682428c8c0ed7c75d15ac4a4
 2012-04-26 19:03:12 -07:00
Dianne Hackborn
ecc5a9cca0 Add new Activity.finishAffinity() method. 
It's cool!

Change-Id: I9fdcd9535b7f1ca2b311d3a1b23e5d058977b095
 2012-04-26 18:56:09 -07:00
Adam Cohen
094833aa6b am ac856e75: am e6eb9291: Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 
* commit 'ac856e75c62e3edbd014eeccb6798d12f85dab3d':
  Fix NPE in RemoteViews (issue 6408103)
 2012-04-26 18:49:21 -07:00
Adam Cohen
ac856e75c6 am e6eb9291: Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 
* commit 'e6eb9291423988e4f2e82367d760490397222fe3':
  Fix NPE in RemoteViews (issue 6408103)
 2012-04-26 18:46:51 -07:00
Adam Cohen
e6eb929142 Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 2012-04-26 18:45:18 -07:00
Adam Cohen
c431c156bb Fix NPE in RemoteViews (issue 6408103) 
Change-Id: I3e7ff2941b721c2c0c5c4e7d598df794b105c391
 2012-04-26 18:42:17 -07:00
Eric Laurent
6d5176638c system and UI sounds volume policy 
Implement a more consistent policy for system and UI sounds (key clicks, lock/unlock,
camera shutter, DTMF, low battery...):
- All system sounds are played over STREAM_SYSTEM stream type.
- The STREAM_SYSTEM volume that was previously fixed now tracks the volume of a "master"
stream type. This "master" stream type is STREAM_RING for phones and STREAM_MUSIC for
tablets which corresponds to the stream whose volume is modified by default by the volume
keys.
- The STREAM_SYSTEM volume ranges from -24dB to -6dB (-24dB to -12dB over headphones) when the
"master" stream volume ranges from its min to its max.
- DTMF tones are played over STREAM_DTMF that tracks the "master" stream volume in the same
manner with the following exception: when in call, DTMF stream tracks STREAM_VOICE_CALL volume.
- Camera shutter sound is played over STREAM_SYSTEM_ENFORCED stream that tracks the "master"
stream volume except in countries where regulation enforces this sound. In this case
its volume is fixed and cannot be muted.
- Low battery sound is played over STREAM_SYSTEM and therefore has a tunable volume and is
heard while in call.

Issue 6344620.
Issue 6069229.
Issue 6213100.

Change-Id: I53a237878ead596e706c5dbbb1420e62cde32bd7
 2012-04-26 18:36:56 -07:00
Yu Shan Emily Lau
7708be1b4b am abb7bf4f: am f18222da: Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 
* commit 'abb7bf4ff8bfd58e50633d881e89a97c7730ad6e':
  Fix the test cases which fail to launch the camera in the device which only has one camera.
 2012-04-26 17:34:44 -07:00
Yu Shan Emily Lau
abb7bf4ff8 am f18222da: Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 
* commit 'f18222da3cdfd3b052361369b70a4d22396039c1':
  Fix the test cases which fail to launch the camera in the device which only has one camera.
 2012-04-26 17:31:11 -07:00
Yu Shan Emily Lau
f18222da3c Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 2012-04-26 17:29:15 -07:00
Yu Shan Emily Lau
e35b3e052d Fix the test cases which fail to launch the camera 
in the device which only has one camera.

Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
 2012-04-26 17:10:29 -07:00
Makoto Onuki
538b343bf9 am 8316e51c: am ccdf0afb: Merge "Update streamitems javadoc" into jb-dev 
* commit '8316e51c450adb3adf3eec59b257ab88549e717f':
  Update streamitems javadoc
 2012-04-26 15:51:45 -07:00
Makoto Onuki
8316e51c45 am ccdf0afb: Merge "Update streamitems javadoc" into jb-dev 
* commit 'ccdf0afbd7dbd4fe2111e94d9e4f14a939ed8882':
  Update streamitems javadoc
 2012-04-26 15:49:06 -07:00
Makoto Onuki
ccdf0afbd7 Merge "Update streamitems javadoc" into jb-dev 2012-04-26 15:47:35 -07:00
Pannag Sanketi
2f708ce9cc Resolving the black screen / crash in effects 
b:/6278826
The SurfaceTextureTarget Filter was not unregistering the surface
on closing leading to crashes and blank screens.

Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
 2012-04-26 15:46:17 -07:00
Makoto Onuki
46891a8f1c Update streamitems javadoc 
ACCOUNT_TYPE and ACCOUNT_NAME query parameters were required in API level 15.
We've removed the check for JB, but in order to keep compatibility with HC
apps still need to add those parameters.

Bug 5135278

Change-Id: Ib9b9751c9017c53905047045816a44c5a279fa64
 2012-04-26 15:41:48 -07:00
Adam Cohen
8e6dc585b4 am db4a8fc6: am 2938ac3f: Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 
* commit 'db4a8fc619be68c743b903ec9aeeb4fb7890d340':
  Enabling RemoteViews to have a landscape and portrait layout
 2012-04-26 15:39:38 -07:00
Adam Cohen
db4a8fc619 am 2938ac3f: Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 
* commit '2938ac3f9fa8d2a8031a6b4bac4d4beb97f99e06':
  Enabling RemoteViews to have a landscape and portrait layout
 2012-04-26 15:37:03 -07:00
Amith Yamasani
8bfdd756b4 am a5dd37cd: am 7a4be122: Merge "Add some missing getters for XML/Java API consistency." into jb-dev 
* commit 'a5dd37cdb63e59849320614fef1b95593576bd83':
  Add some missing getters for XML/Java API consistency.
 2012-04-26 15:36:48 -07:00
Adam Cohen
2938ac3f9f Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 2012-04-26 15:35:13 -07:00
Eric Fischer
1b5d3fc2a8 am d09fab85: (-s ours) am 16fb5d44: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'd09fab85c4b05767104705f236dfbdca4318626a':
  Import translations. DO NOT MERGE
 2012-04-26 15:33:58 -07:00
Amith Yamasani
a5dd37cdb6 am 7a4be122: Merge "Add some missing getters for XML/Java API consistency." into jb-dev 
* commit '7a4be122cd0073240122b9f9badc78df677ea791':
  Add some missing getters for XML/Java API consistency.
 2012-04-26 15:32:20 -07:00
Dianne Hackborn
a1f86425af am 6fa78731: am 8e6159b8: Merge "Add traces for window manager and activity manager." into jb-dev 
* commit '6fa787319314b59b058dc46d1c97e95f04914258':
  Add traces for window manager and activity manager.
 2012-04-26 15:30:44 -07:00
Amith Yamasani
7a4be122cd Merge "Add some missing getters for XML/Java API consistency." into jb-dev 2012-04-26 15:28:52 -07:00
Eric Fischer
d09fab85c4 am 16fb5d44: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '16fb5d444cea1c978257807910b96d4e47b78dce':
  Import translations. DO NOT MERGE
 2012-04-26 15:28:48 -07:00
Eric Fischer
c6bcdeb02a Merge "Import translations. DO NOT MERGE" 2012-04-26 15:27:16 -07:00