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

29454 Commits

Author SHA1 Message Date
Jaikumar Ganesh
032aeafd68 am d5af1724: am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit 'd5af1724500f42e389cc2b8a0be9bacdf53405ad':
  Hardware geofence API changes.
 2013-04-17 22:25:18 -07:00
Jaikumar Ganesh
d5af172450 am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
 2013-04-17 22:21:32 -07:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes. 
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
 2013-04-17 22:18:01 -07:00
Mathias Agopian
b35fbd5720 am 740cf4ec: am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit '740cf4ec31b8d7363c9a0f839afda3d8cb0ab9a3':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:36:08 -07:00
Mathias Agopian
740cf4ec31 am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:32:24 -07:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Chet Haase
68293ecb91 am 78296cb7: am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit '78296cb760bff8bf951e88d6f4ec9a6ff3059406':
  Fixes for setClipBounds()
 2013-04-17 15:54:52 -07:00
Chet Haase
78296cb760 am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
 2013-04-17 15:49:17 -07:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}() 
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
 2013-04-17 15:04:47 -07:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:23:01 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Adam Cohen
f4865efe60 am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:06:33 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack. 
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
 2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations 
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
 2013-04-17 10:44:44 -07: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
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings 
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
 2013-04-16 18:33:43 -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
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
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
Chet Haase
21f9a3608d Fixes for setClipBounds() 
The invalidate region when the clip bounds are set needs to encompass both
the old clip bounds and the new bounds, to make sure that the right area
of the view gets erased as well as drawn.

Also, we need to keep our own internal copy of the bounds, not just use the
instance passed into the setter.

Issue #8634060 setClipBounds() problems

Change-Id: I123c49cff16e3debe8866974a5612a4efd010de4
 2013-04-16 17:57:11 -07: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
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
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