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

86996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
5af1c8f142 am 9a85f970: am 29d0aa73: Merge "Compute GradientDrawable\'s opacity correctly" into jb-mr1-dev 
* commit '9a85f9704345b9c7b08302dc7f53a96526a43f7a':
  Compute GradientDrawable's opacity correctly
 2012-09-18 15:46:21 -07:00
Geremy Condra
9242dfc635 am 93296d23: am ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 
* commit '93296d23c87059a2dfda09df92e1f902f4f6766b':
  Code cleanup for X509TrustManagerExtensionsTest.java
 2012-09-18 15:46:17 -07:00
Romain Guy
9a85f97043 am 29d0aa73: Merge "Compute GradientDrawable\'s opacity correctly" into jb-mr1-dev 
* commit '29d0aa73a099fde05c506857b5d215cde87b78d6':
  Compute GradientDrawable's opacity correctly
 2012-09-18 15:43:33 -07:00
Geremy Condra
93296d23c8 am ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 
* commit 'ad79342786f989a9b478be52b1a06272c28574ec':
  Code cleanup for X509TrustManagerExtensionsTest.java
 2012-09-18 15:43:29 -07:00
Winson Chung
f42980f9f7 am bf4a17aa: am 688ca470: Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 
* commit 'bf4a17aaf0136690aaf0e3d52217bdea35aebfe5':
  Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
 2012-09-18 15:41:22 -07:00
Jim Miller
c5f59eea79 am 65e1922a: am 6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 
* commit '65e1922ae6614e34120153cd137190fc1fd30759':
  Remove trailing period from missing SIM string
 2012-09-18 15:41:18 -07:00
Winson Chung
bf4a17aaf0 am 688ca470: Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 
* commit '688ca4708bad4a7c829758449664f08be48fa246':
  Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
 2012-09-18 15:39:34 -07:00
Romain Guy
29d0aa73a0 Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev 2012-09-18 15:39:30 -07:00
Jim Miller
65e1922ae6 am 6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 
* commit '6eac514a026d303bfdec34f9314debc58c3809b8':
  Remove trailing period from missing SIM string
 2012-09-18 15:39:30 -07:00
Jim Miller
e0354ee651 am 41625709: am 772db427: Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 
* commit '4162570931630c28671fade700cf84d74b72b50c':
  Selectively enable back button in keyguard for security screens.
 2012-09-18 15:38:22 -07:00
Romain Guy
e91aa0fa64 Compute GradientDrawable's opacity correctly 
The current implementation of GradientDrawable always assumes the shape needs
to be blended. This causes all windows to be considered translucent by default.
This change recomputes the opacity as needed to ensure windows are marked
opaque when they should.

Change-Id: Iaf291d889a6c5122ab00c9f5781df3e7f61547fa
 2012-09-18 15:37:24 -07:00
Geremy Condra
ad79342786 Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 2012-09-18 15:37:22 -07:00
Winson Chung
688ca4708b Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 2012-09-18 15:34:37 -07:00
Jim Miller
4162570931 am 772db427: Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 
* commit '772db427a79fc1e81cb54f8ebead5e22edb0162d':
  Selectively enable back button in keyguard for security screens.
 2012-09-18 15:34:20 -07:00
Irfan Sheriff
35953dea54 am 2166387e: am 7d0882be: Merge "send connection broadcast on client disconnect" into jb-mr1-dev 
* commit '2166387e4f72b3a3d94b01f1c1d2ef1796447ed5':
  send connection broadcast on client disconnect
 2012-09-18 15:33:52 -07:00
Jim Miller
6eac514a02 Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 2012-09-18 15:33:49 -07:00
Jeff Sharkey
3611eacaaa am e339f025: am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit 'e339f025e44558e251ac67fc3f3d5c909264adfc':
  Multi-user MTP.
 2012-09-18 15:33:23 -07:00
Jim Miller
772db427a7 Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 2012-09-18 15:32:04 -07:00
Irfan Sheriff
2166387e4f am 7d0882be: Merge "send connection broadcast on client disconnect" into jb-mr1-dev 
* commit '7d0882be6d7e2a434072cb0bb63cb117e73491cb':
  send connection broadcast on client disconnect
 2012-09-18 15:29:06 -07:00
Irfan Sheriff
7d0882be6d Merge "send connection broadcast on client disconnect" into jb-mr1-dev 2012-09-18 15:26:16 -07:00
Irfan Sheriff
5ef9c59fff send connection broadcast on client disconnect 
Bug: 7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
 2012-09-18 15:17:56 -07:00
Jeff Sharkey
e339f025e4 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.
 2012-09-18 15:14:20 -07:00
Fabrice Di Meglio
e43eb80129 am 63809304: am 8b3560d3: Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 
* commit '63809304f0cb975d9519c306d8964bdc2568281b':
  Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable
 2012-09-18 14:59:05 -07:00
Fabrice Di Meglio
ad31d027ca am 684f1078: am 20586fa0: Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 
* commit '684f10788707f154e54a614b2d60cc28542aee3a':
  Fix bug #7173351 API REVIEW: android.util.LocaleUtil
 2012-09-18 14:59:00 -07:00
Adam Cohen
5eccd5e703 am b3e98d2a: am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit 'b3e98d2a1b0594595d7054c74fe157504dedaf2b':
  Tweaking how settings adds keyguard widgets
 2012-09-18 14:58:56 -07:00
Fabrice Di Meglio
bceecf56a3 am 7dc062a9: am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit '7dc062a96217f6e82c77de73a6679d23718c5f11':
  Fix bug #7172699
 2012-09-18 14:58:50 -07:00
Jamie Gennis
61a82a116a am ca10e561: am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit 'ca10e561a396049adb9c8e6cb961dace20d72bb7':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:55:53 -07:00
Andy Stadler
224ed25f2c am 37c6ec36: am ab3d0fd6: Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit '37c6ec36b8dc81781b737793e14d080d93ca5017':
  Move files to make eclipse-java happy
 2012-09-18 14:55:49 -07:00
Chet Haase
88bd5cc664 am d9a3dac7: am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit 'd9a3dac7dde36a917b7cc614ff271f50ee11456c':
  Fix GL shader bugs
 2012-09-18 14:55:46 -07:00
Fabrice Di Meglio
63809304f0 am 8b3560d3: Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 
* commit '8b3560d3e68d6e596bc22b117b049e15cc7e1b3b':
  Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable
 2012-09-18 14:54:27 -07:00
Fabrice Di Meglio
684f107887 am 20586fa0: Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 
* commit '20586fa0353f63453766140b32a4778793ce2b43':
  Fix bug #7173351 API REVIEW: android.util.LocaleUtil
 2012-09-18 14:54:23 -07:00
Adam Cohen
b3e98d2a1b am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets
 2012-09-18 14:54:20 -07:00
Fabrice Di Meglio
7dc062a962 am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit 'dbed514e137de66d19050b72ad941a687e13c9d4':
  Fix bug #7172699
 2012-09-18 14:54:13 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Jamie Gennis
ca10e561a3 am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit '94998c9c4e19d5b439228646f1b283201367b7a0':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:51:58 -07:00
Andy Stadler
37c6ec36b8 am ab3d0fd6: Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit 'ab3d0fd684eabecd6b290ef3cb9799739db04ca3':
  Move files to make eclipse-java happy
 2012-09-18 14:51:54 -07:00
Chet Haase
d9a3dac7dd am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit '48618c987eed656bf3d8baa6ce25b7f5d3f4a43e':
  Fix GL shader bugs
 2012-09-18 14:51:50 -07:00
Fabrice Di Meglio
8b3560d3e6 Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 2012-09-18 14:50:47 -07:00
Fabrice Di Meglio
20586fa035 Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Adam Cohen
642258a29b Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Winson Chung
84dbf462f8 Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166) 
Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
 2012-09-18 14:48:00 -07:00
Fabrice Di Meglio
dbed514e13 Merge "Fix bug #7172699" into jb-mr1-dev 2012-09-18 14:46:59 -07:00
Geremy Condra
fd5a80f6e9 Code cleanup for X509TrustManagerExtensionsTest.java 
Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
 2012-09-18 14:44:54 -07:00
Adam Cohen
60264730c1 Tweaking how settings adds keyguard widgets 
-> Fix for issue 7173587
-> Fix for issue 7173877

Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
 2012-09-18 14:38:04 -07:00
Jamie Gennis
94998c9c4e Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 2012-09-18 14:32:01 -07:00
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Chet Haase
48618c987e Merge "Fix GL shader bugs" into jb-mr1-dev 2012-09-18 14:13:57 -07:00
Chet Haase
0990ffbc4d Fix GL shader bugs 
Fixing errors in emitted shader code that caused GL errors
at runtime

Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
 2012-09-18 14:10:10 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy 
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
 2012-09-18 14:08:30 -07:00
Geremy Condra
13f9a21c87 am afc4fba7: am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'afc4fba7cc97ab90c58f19ca42c0ecdfc3b6d942':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 13:59:51 -07:00