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

104950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
af1653a851 resolved conflicts for merge of 6c18e2c8 to master 
Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1
 2013-04-17 10:33:23 -07:00
Victoria Lease
6c18e2c89f am 25df1a82: Merge "use appropriate fallback chain for style" into jb-mr2-dev 
* commit '25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd':
  use appropriate fallback chain for style
 2013-04-17 09:27:49 -07:00
Victoria Lease
25df1a82a8 Merge "use appropriate fallback chain for style" into jb-mr2-dev 2013-04-17 16:23:38 +00:00
Daniel Sandler
a38006d74f am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '74c69f1e0c184faeaf0e02f2a0445d1c436b6287':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:12:11 -07:00
Daniel Sandler
74c69f1e0c am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:07:02 -07:00
Daniel Sandler
66769767b6 Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 2013-04-17 16:04:33 +00:00
Daniel Sandler
3147523c10 Treat the default sound Uri the same as DEFAULT_SOUND. 
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)

Bug: 8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
 2013-04-17 10:59:50 -04:00
Chet Haase
8c00be17e3 am 5bded3bf: am 8bba7510: Fix build - remove obsolete import of Animatable 
* commit '5bded3bfe19cdf57620c7b6fa5ae7608333f3e7e':
  Fix build - remove obsolete import of Animatable
 2013-04-17 07:07:19 -07:00
Chet Haase
5bded3bfe1 am 8bba7510: Fix build - remove obsolete import of Animatable 
* commit '8bba7510bc96d5404c070a4846318ee6a9eb1365':
  Fix build - remove obsolete import of Animatable
 2013-04-17 07:04:38 -07:00
Chet Haase
8bba7510bc Fix build - remove obsolete import of Animatable 
Change-Id: I3133669386f50177c863f8a58733be771f819a17
 2013-04-17 06:44:08 -07:00
Chet Haase
270003d636 am 91fedd82: am 873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev 
* commit '91fedd820bf51061c384d0dc18ea4d15ed22eeaf':
  Remove Animatable interface
 2013-04-17 06:42:22 -07:00
Chet Haase
91fedd820b am 873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev 
* commit '873d3ca43dc054222e635586b760125078fb7c39':
  Remove Animatable interface
 2013-04-17 06:38:38 -07:00
Chet Haase
873d3ca43d Merge "Remove Animatable interface" into jb-mr2-dev 2013-04-17 13:36:00 +00:00
Kristian Monsen
f5b69a17de am bd4dbe73: am 87c67f31: Merge "Part of fix for bug 8629392" into jb-mr2-dev 
* commit 'bd4dbe73a962426651ed256b131176f2bdecc316':
  Part of fix for bug 8629392
 2013-04-16 19:27:05 -07:00
Kristian Monsen
bd4dbe73a9 am 87c67f31: Merge "Part of fix for bug 8629392" into jb-mr2-dev 
* commit '87c67f315c0eea253c73ae7ebb40931c686a406d':
  Part of fix for bug 8629392
 2013-04-16 19:24:56 -07:00
Kristian Monsen
87c67f315c Merge "Part of fix for bug 8629392" into jb-mr2-dev 2013-04-17 02:22:26 +00:00
Craig Mautner
bbcc289dad Merge "Incremental repairs to side by side stacks." 2013-04-17 01:58:51 +00:00
Craig Mautner
53078b25c9 Merge "Implement stack splitting and task movement." 2013-04-17 01:58:15 +00:00
Craig Mautner
4cd0c13f8f Incremental repairs to side by side stacks. 
- Add taskId parameter to createStack() so stacks are pre-populated
with a task.
- Keep track of stack access order in DisplayContent so getTasks
returns in MRU order.
- Set touchableRegion in InputMonitor so modal touching does not
extend beyond stack boundary.
- Fix stack merging so that deleting a stack results in a new
stack the size of the two children.

Change-Id: I62a6ba0a34f34dd7ec866b440bf04595379e19e8
 2013-04-16 18:55:07 -07:00
Kristian Monsen
083c4dc1ac Part of fix for bug 8629392 
Adding extra logging to fix cts bugs that are only on bots

Change-Id: I24b4b7aad200ffc23c002f4a8f0fe9246991c4f0
 2013-04-16 18:14:47 -07:00
Chris Craik
e76dd37bdb am 680ca941: am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 
* commit '680ca9418b6b3f01547b286d1a80e07e186bc05f':
  Make layer double drawing visible in overdraw debug mode
 2013-04-16 18:02:31 -07:00
Philip Milne
d05849e887 am a1ea8019: am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 
* commit 'a1ea801956c4727656ef25177b1bb4c5b788cde7':
  Fix for bug 8272673: GridLayout in battery details is cut off.
 2013-04-16 18:02:28 -07:00
Chris Craik
680ca9418b am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 
* commit 'ec5dc76a15081136fa57d10a231d1c5ac5901421':
  Make layer double drawing visible in overdraw debug mode
 2013-04-16 18:00:18 -07:00
Philip Milne
a1ea801956 am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 
* commit '61527436b7fd5d8dd42eaf8052c02816e6a13887':
  Fix for bug 8272673: GridLayout in battery details is cut off.
 2013-04-16 18:00:15 -07:00
Chris Craik
ec5dc76a15 Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 2013-04-17 00:58:43 +00:00
Philip Milne
61527436b7 Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 2013-04-17 00:56:55 +00:00
Chet Haase
e8cee38c6a Remove Animatable interface 
Push the interface methods from the new Animatable interface back
down into Animator, from whence they came.

Issue #8634310 Remove Animatable interface

Change-Id: I79e26001709d791d54fcb02561640fe2e008b1fd
 2013-04-16 17:54:14 -07:00
Ben Gruver
303d004ca0 am e920a298: am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit 'e920a298f7ee7005b05a0d689e0aae5ca1b369e9':
  Monitor the firewall rules file for changes
 2013-04-16 17:51:04 -07:00
Ben Gruver
e920a298f7 am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit '53f22ad9c30e03f4762737a722b2762dcf934523':
  Monitor the firewall rules file for changes
 2013-04-16 17:47:57 -07:00
Ben Gruver
53f22ad9c3 Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 2013-04-17 00:44:56 +00:00
Jamie Gennis
a720a87fde am a0b28ca7: am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev 
* commit 'a0b28ca74806dcf46300d82ebb689b002bd36955':
  Disable tracing from Zygote
 2013-04-16 17:01:12 -07:00
Dmitry Shmidt
92dc450782 Merge "softap: Set broadcast option explicitly" 2013-04-16 23:59:50 +00:00
Jamie Gennis
a0b28ca748 am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev 
* commit '95a869f91bb9ab24300cec37037b0edcfa54f334':
  Disable tracing from Zygote
 2013-04-16 16:59:07 -07:00
Doug Zongker
057d3eb1bd Merge "RecoverySystem: update comment to reflect signature changes" 2013-04-16 23:56:28 +00:00
Jamie Gennis
95a869f91b Merge "Disable tracing from Zygote" into jb-mr2-dev 2013-04-16 23:55:33 +00:00
Philip Milne
e0b85cd706 Fix for bug 8272673: GridLayout in battery details is cut off. 
Change-Id: Iabcc2d2c486162cf88990eb1a25aca2e7558a57c
 2013-04-16 16:33:44 -07:00
Fabrice Di Meglio
0c6d1ba9db am fa681f12: am 09d0ee26: Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev 
* commit 'fa681f12ec645eaf2831e75abdd32c9987d6afa0':
  Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
 2013-04-16 16:23:44 -07:00
Fabrice Di Meglio
fa681f12ec am 09d0ee26: Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev 
* commit '09d0ee261d11396e1541c23d8f4f3f5d7e6a9e18':
  Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app
 2013-04-16 16:19:53 -07:00
Fabrice Di Meglio
09d0ee261d Merge "Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app" into jb-mr2-dev 2013-04-16 23:15:17 +00:00
Fabrice Di Meglio
3a1f1e5bea Fix bug #8629386 FastScroller is on the wrong side when switching to Hebrew in a RTL enabled app 
- in AbsListView, force setScrollbarPosition() when RTL properties change
- in FastScroller, invalidate the correct rectangle when in RTL mode and in STATE_EXIT

Change-Id: Ie9fe4f826e179eb993e443d10e171b9dda3b6f3f
 2013-04-16 15:40:18 -07:00
Jesse Hall
25beec154b am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 
* commit 'b690c9a2210f020341ba68dd947b4e2ff43e007d':
  Unhide android.opengl.GLES30 class and contents
 2013-04-16 15:25:16 -07:00
Jesse Hall
b690c9a221 am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 
* commit 'c7bdd50c97d874456d0408599c1a6145186167dd':
  Unhide android.opengl.GLES30 class and contents
 2013-04-16 15:21:52 -07:00
Jesse Hall
c7bdd50c97 Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 2013-04-16 22:17:20 +00:00
Jamie Gennis
6ad0452e63 Disable tracing from Zygote 
This change disables all atrace tracing in Zygote immediately after it is
initialized.  This is necessary because Zygote has no way to receive
notifications that the enabled trace tags have been changed.  Tracing is
re-enabled when other processes fork from Zygote.

Change-Id: If2983858fb0c4890ba9ab041849b1c4d98f66c13
 2013-04-16 22:15:21 +00:00
Irfan Sheriff
67c43942e1 am 26439185: am d12a7645: Merge "Fix enabling networks after driver stop" into jb-mr2-dev 
* commit '264391856afc3f04aecbd0c0cd446a5caccb04e1':
  Fix enabling networks after driver stop
 2013-04-16 15:07:43 -07:00
Chris Craik
34416eaa1c Make layer double drawing visible in overdraw debug mode 
A clipped saveLayer will cause two draws - first to an onscreen
buffer, then again back to the framebuffer. This change - when in
overdraw debug - reissues draws associated with a clipped saveLayer,
but only to the stencil buffer. Operations within a saveLayer are
shown correctly to be twice drawn, and View.setAlpha() without an
associated hardware layer, or hasOverlappingRendering() are made more
visible.

Hardware layers, on any frame that they are updated, similarly draw
twice, and will also be counted against the stencil buffer doubly.

Note: greater depths of layers - e.g. a saveLayer within a saveLayer -
are not respected, as that would require additional region tracking.

Change-Id: I61fb0e61038fe66013d59914c20bb47a550dea7d
 2013-04-16 15:05:49 -07:00
Irfan Sheriff
264391856a am d12a7645: Merge "Fix enabling networks after driver stop" into jb-mr2-dev 
* commit 'd12a7645a3bf3ffa83b8041bf343f1dc12a2381f':
  Fix enabling networks after driver stop
 2013-04-16 15:04:21 -07:00
Irfan Sheriff
d12a7645a3 Merge "Fix enabling networks after driver stop" into jb-mr2-dev 2013-04-16 22:00:11 +00:00
Svetoslav Ganov
c06464acf0 am 84677dff: am ad435ba7: Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev 
* commit '84677dff59a663204743343e92fcab1ddbd057f4':
  Send tab selection event from ScrollingTabContainerView.
 2013-04-16 14:48:02 -07:00
Svetoslav Ganov
84677dff59 am ad435ba7: Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev 
* commit 'ad435ba7fff45b8a15ebda08f88767511935a5d7':
  Send tab selection event from ScrollingTabContainerView.
 2013-04-16 14:45:38 -07:00