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

85012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ff88bee1c0 am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev 
* commit '1e5aeecb64827d2b71f429d73a05c25ffe4a5be8':
  Don't allow more than 3 actively running users at a time.
 2012-09-18 18:30:08 -07:00
Dianne Hackborn
1e5aeecb64 Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev 2012-09-18 18:22:15 -07:00
Dianne Hackborn
bb1aeff320 Don't allow more than 3 actively running users at a time. 
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
 2012-09-18 18:20:43 -07:00
Andy Stadler
2e16d61257 am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:54:36 -07:00
Andy Stadler
6d4e887da4 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 2012-09-18 17:51:09 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory 
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
 2012-09-18 17:40:14 -07:00
Mike Lockwood
4074f0817e am 954a5d61: Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 
* commit '954a5d61a2b66a64a841669f75e1cbd9103029b5':
  AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
 2012-09-18 17:15:35 -07:00
Mike Lockwood
954a5d61a2 Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 2012-09-18 17:12:37 -07:00
Romain Guy
51f225bbe3 am 24755d2b: Merge "mutate() didn\'t work as advertised Bug #7162705" into jb-mr1-dev 
* commit '24755d2b4248c2aa678e08a4703e8e97fd2e7dd1':
  mutate() didn't work as advertised Bug #7162705
 2012-09-18 17:06:03 -07:00
Jim Miller
0c6c57e390 am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 
* commit '402f0c81230304379d7c4108745f928b34e052fa':
  Refactor Carrier text as a movable module.
 2012-09-18 17:04:13 -07:00
Romain Guy
24755d2b42 Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev 2012-09-18 17:03:04 -07:00
Jim Miller
402f0c8123 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 2012-09-18 17:00:38 -07:00
Romain Guy
684385ddde mutate() didn't work as advertised 
Bug #7162705

Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
 2012-09-18 16:56:11 -07:00
Romain Guy
4247ec1d56 am ceb5a981: Merge "Minimize state changes when updating layers" into jb-mr1-dev 
* commit 'ceb5a981296e57a5fb1be60f7b030c4d6c7e0acb':
  Minimize state changes when updating layers
 2012-09-18 15:54:59 -07:00
Fabrice Di Meglio
eef4e625d3 am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 
* commit '9ffc6047f14883f853b643a2913bd590995b9031':
  Fix bug #7173155 API REVIEW: android.view.View
 2012-09-18 15:54:55 -07:00
Romain Guy
8055bd0920 am 29d0aa73: Merge "Compute GradientDrawable\'s opacity correctly" into jb-mr1-dev 
* commit '29d0aa73a099fde05c506857b5d215cde87b78d6':
  Compute GradientDrawable's opacity correctly
 2012-09-18 15:54:51 -07:00
Geremy Condra
24c23fb02f am ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 
* commit 'ad79342786f989a9b478be52b1a06272c28574ec':
  Code cleanup for X509TrustManagerExtensionsTest.java
 2012-09-18 15:54:47 -07:00
Winson Chung
bb0aebe657 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:54:42 -07:00
Jim Miller
0699e83021 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:54:38 -07:00
Jim Miller
44b19614e3 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:54:35 -07:00
Romain Guy
ceb5a98129 Merge "Minimize state changes when updating layers" into jb-mr1-dev 2012-09-18 15:43:05 -07:00
Fabrice Di Meglio
9ffc6047f1 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 2012-09-18 15:42:34 -07:00
Romain Guy
35643ddc68 Minimize state changes when updating layers 
Change-Id: I407fcc80bd3178f9f09a3b379ceb7f7ce0749e08
 2012-09-18 15:41:16 -07:00
Romain Guy
29d0aa73a0 Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev 2012-09-18 15:39:30 -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
6eac514a02 Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 2012-09-18 15:33:49 -07:00
Fabrice Di Meglio
c11f77fbae Fix bug #7173155 API REVIEW: android.view.View 
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc

Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
 2012-09-18 15:33:07 -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
7780df7789 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:28:47 -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
ed1a377f80 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.
 2012-09-18 15:00:33 -07:00
Fabrice Di Meglio
7822763892 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 15:00:25 -07:00
Fabrice Di Meglio
8bf1cb378b 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 15:00:14 -07:00
Adam Cohen
072d35167f am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets
 2012-09-18 15:00:09 -07:00
Fabrice Di Meglio
9120d133b1 am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit 'dbed514e137de66d19050b72ad941a687e13c9d4':
  Fix bug #7172699
 2012-09-18 14:59:59 -07:00
Jamie Gennis
232746e351 am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit '94998c9c4e19d5b439228646f1b283201367b7a0':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:59:38 -07:00
Andy Stadler
82d3529968 am ab3d0fd6: (-s ours) 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:59:34 -07:00
Mike Lockwood
db45484e4b AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected 
Bug: 7051259

Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-09-18 14:55:52 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -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
Chet Haase
8bcfe1bf25 am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit '48618c987eed656bf3d8baa6ce25b7f5d3f4a43e':
  Fix GL shader bugs
 2012-09-18 14:49:55 -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