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

87027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
07b199c8b0 Merge "Import translations. DO NOT MERGE" 2012-09-19 09:11:04 -07:00
Derek Sollenberger
2a6ecae93d Fix Skia assertions where we were allowing immutable bitmaps to be written to. 
bug: 7092330
Change-Id: I4a9d1d299244d46172562080c56c8360f5e4af02
 2012-09-19 07:21:12 -07:00
Dianne Hackborn
1cf4289349 am 8f2ec436: am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev 
* commit '8f2ec4365f518a9752e379ca87e3fcdcd2c4c55f':
  Don't allow more than 3 actively running users at a time.
 2012-09-19 05:50:39 -07:00
Dianne Hackborn
8f2ec4365f 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:26:21 -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
6f3fd45b3c am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit 'fe0131839214ce6251def672bba0855e395ed54f':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:58:05 -07:00
Andy Stadler
fe01318392 am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:55:21 -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
ce0f2a8d16 am 9500fd5c: am 954a5d61: Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 
* commit '9500fd5cbae42cc0d9dad6eb9cb10ac2a426bb70':
  AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
 2012-09-18 17:24:08 -07:00
Romain Guy
fe3765cdde am 40f14aa2: am 24755d2b: Merge "mutate() didn\'t work as advertised Bug #7162705" into jb-mr1-dev 
* commit '40f14aa2158801e33550889086bfd8768d3fdca6':
  mutate() didn't work as advertised Bug #7162705
 2012-09-18 17:17:00 -07:00
Jim Miller
65c4227e97 am 29a1b604: am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 
* commit '29a1b604cceb302da4b1636af337bb7551dccac8':
  Refactor Carrier text as a movable module.
 2012-09-18 17:16:56 -07:00
Mike Lockwood
9500fd5cba 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:14:53 -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
40f14aa215 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:08:03 -07:00
Jim Miller
29a1b604cc 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:06 -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
20953de760 am 4b8faab7: am ceb5a981: Merge "Minimize state changes when updating layers" into jb-mr1-dev 
* commit '4b8faab7f04cd870b76361e6aef8e27a138d013b':
  Minimize state changes when updating layers
 2012-09-18 15:49:27 -07:00
Fabrice Di Meglio
570fa75f71 am fa0fea91: am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 
* commit 'fa0fea917f1cd08b68f69495ac5c05de584dc825':
  Fix bug #7173155 API REVIEW: android.view.View
 2012-09-18 15:49:23 -07:00
Romain Guy
4b8faab7f0 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:46:26 -07:00
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
Fabrice Di Meglio
fa0fea917f 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: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
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
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
Romain Guy
35643ddc68 Minimize state changes when updating layers 
Change-Id: I407fcc80bd3178f9f09a3b379ceb7f7ce0749e08
 2012-09-18 15:41:16 -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
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
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