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

32509 Commits

Author SHA1 Message Date
Dianne Hackborn
b1add0b8f2 am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery
 2012-06-12 13:00:15 -07:00
Chia-chi Yeh
7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:59:59 -07:00
Amith Yamasani
82f47c95b6 Merge "Disable lockscreen using a system property." 2012-06-12 12:57:18 -07:00
Dianne Hackborn
6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
 2012-06-12 12:41:36 -07:00
Eric Fischer
19e046c4d2 am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
  Import translations. DO NOT MERGE
 2012-06-12 12:41:20 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:41:12 -07:00
Jeff Brown
681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.
 2012-06-12 12:41:11 -07:00
Amith Yamasani
d1645f8d0f Disable lockscreen using a system property. 
For factory testing.

Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
 2012-06-12 11:53:26 -07:00
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp 
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
 2012-06-12 11:10:26 -07:00
George Mount
7c79dd674a Merge "Move handle into view after using it for scrolling." 2012-06-12 08:32:48 -07:00
George Mount
ab70020137 Merge "Fix caret handle offset" 2012-06-12 08:32:35 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:41:19 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:41:13 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:36:49 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:36:42 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:32:26 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:32:20 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00
Fabrice Di Meglio
97eb02f16f Merge "Make GridView widget aware of layout direction" 2012-06-11 13:07:30 -07:00
Dianne Hackborn
2bd8d0403b Fix issue #6641368: can't launch gallery 
This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82
 2012-06-11 12:27:05 -07:00
Jean-Baptiste Queru
80d21f2f83 am 19703b13: Merge "Avoid memory leak in the Shutdown confirmation dialog." 
* commit '19703b13a6201812ebcf73904feb700aeb1afb45':
  Avoid memory leak in the Shutdown confirmation dialog.
 2012-06-11 12:03:32 -07:00
Eric Fischer
d86927cb58 Merge "Import translations. DO NOT MERGE" 2012-06-11 11:57:24 -07:00
Eric Fischer
1b159f66ee Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-11 11:56:22 -07:00
Eric Fischer
4dc7089f31 Import translations. DO NOT MERGE 
Change-Id: I845e08014966cf6ee5442f1511301d4b3faa0ab1
 2012-06-11 11:51:42 -07:00
Chia-chi Yeh
d667aebfb3 Merge "VPN: move VpnDialogs away from system uid." into jb-dev 2012-06-11 11:49:46 -07:00
Jeff Brown
926a5c507b Merge "Remove edge slop handling from ScaleGestureDetector." into jb-dev 2012-06-11 11:46:42 -07:00
Eric Fischer
34b729d335 Import translations. DO NOT MERGE 
Change-Id: I937a8a4cc8617744f4a63d72fe946b0e2d543ede
 2012-06-11 11:42:43 -07:00
Jean-Baptiste Queru
19703b13a6 Merge "Avoid memory leak in the Shutdown confirmation dialog." 2012-06-11 11:21:58 -07:00
Dianne Hackborn
be782a6aa0 am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev 
* commit '3857681e5885b64e593dcc3e28492b156d860ed3':
  Include important native processes in watchdog stacks.
 2012-06-11 10:44:52 -07:00
Dianne Hackborn
3857681e58 am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev 
* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
  Include important native processes in watchdog stacks.
 2012-06-11 10:41:09 -07:00
Dianne Hackborn
a7e3a1e0e7 Merge "Include important native processes in watchdog stacks." into jb-dev 2012-06-11 10:37:51 -07:00
Steve Block
ca2ef2cbb1 Merge "Fix style for Geolocation mock mechanism" 2012-06-11 10:32:35 -07:00
Mattias Petersson
8b4b63403a Avoid memory leak in the Shutdown confirmation dialog. 
How to reproduce:
1) Lock the screen.
2) Open the Phone options menu by long pressing the power
   button.
3) Tap "Power off" to display the confirmation dialog.
4) Repeat step 2 and 3 a few times (without closing the
   confirmation dialog.

Each time the confirmation dialog is displayed, a new
instance is created. A stack of confirmation dialogs are
created on the screen.

This is fixed by making sure the previous dialog is
dismissed before launching a new dialog.

Change-Id: I6b6c61ccc56364b66eed3528019f761e75bbe268
 2012-06-11 10:18:09 +02:00
Chet Haase
0163b175d3 am fdb67a4d: am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev 
* commit 'fdb67a4dda0da858eba2103f899250acf9a221e5':
  Don't allow apps to request scrolls to out-of-bounds positions
 2012-06-10 12:37:54 -07:00
Chet Haase
fdb67a4dda am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev 
* commit '913bf80416a81f2783376939e7ad0b956975b05c':
  Don't allow apps to request scrolls to out-of-bounds positions
 2012-06-10 12:33:19 -07:00
Chet Haase
913bf80416 Merge "Don't allow apps to request scrolls to out-of-bounds positions" into jb-dev 2012-06-10 12:30:33 -07:00
Svetoslav Ganov
a656414e94 am 3dbb70ec: am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 
* commit '3dbb70ec9c593e11dd19efa528a99e9ec21d63e0':
  Settings crash after enabling TalkBack accessibility.
 2012-06-10 09:57:18 -07:00
Svetoslav Ganov
3dbb70ec9c am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 
* commit '86bbf70587602c1fd86fce1a2a4be78da45aaedc':
  Settings crash after enabling TalkBack accessibility.
 2012-06-10 09:53:17 -07:00
Svetoslav Ganov
86bbf70587 Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 2012-06-10 09:50:24 -07:00
Dianne Hackborn
f72467ad98 Include important native processes in watchdog stacks. 
Helps us track down deadlocks involving native service processes.

Bug: 6615693
Change-Id: I580047550772e29586195a8cf440141574e3f40c
 2012-06-08 18:36:48 -07:00
Victoria Lease
c3672a4e19 am 2203fab2: am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 
* commit '2203fab24966c80af5c37f0a58263218dbbcd610':
  Fix fake bold for fallback fonts in frameworks.
 2012-06-08 17:33:35 -07:00
Victoria Lease
2203fab249 am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 
* commit '2e6f9be5633cf37223425b9b93c0b1512db091af':
  Fix fake bold for fallback fonts in frameworks.
 2012-06-08 17:29:56 -07:00
Victoria Lease
2e6f9be563 Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 2012-06-08 17:27:28 -07:00
Eric Fischer
4bdf62727e am d9038fd5: Import translations. DO NOT MERGE 
* commit 'd9038fd5568522abea033f2b826823f197c2a970':
  Import translations. DO NOT MERGE
 2012-06-08 16:41:34 -07:00
Jeff Brown
076f17375b Remove edge slop handling from ScaleGestureDetector. 
The edge slop code could violate invariants of ScaleGestureDetector,
such as the assumption that if an ACTION_POINTER_DOWN is observed
or if getPointerCount() >= 2, then there must be at least two
active pointers to choose from.  But due to the edge slop handling,
it was possible for findNewActiveIndex to return -1 in this
case, resulting in a crash.

Bug: 6613154
Change-Id: I4e08e38a49ab27dac1be9484e19de086bc43624a
 2012-06-08 16:40:01 -07:00
Eric Fischer
d9038fd556 Import translations. DO NOT MERGE 
Change-Id: I0edaecd41cef0eb158d003a3a0aafe28f49949f7
 2012-06-08 16:31:51 -07:00
Svetoslav Ganov
ee33ad24cd Settings crash after enabling TalkBack accessibility. 
1. AccessibilityInput filter was not checking whether the touch
   explorer instance is not null before passing it an accessibility
   event. If the accessibility event is dispatched before the input
   filter is installed but after it is created we runt into this
   case.

2. Added a missing null check in accessibility node info.

bug:6635089

Change-Id: Ia389dc1f427427eb73794f6331ccb870e0b44c55
 2012-06-08 16:09:36 -07:00
Fabrice Di Meglio
a598720ad6 Make GridView widget aware of layout direction 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Id9ac26028c176e429a7f3ad76c0a428613e1afc8
 2012-06-08 15:22:20 -07:00