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
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
78296cb760
am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev
...
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
Fixes for setClipBounds()
2013-04-17 15:49:17 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
Svetoslav Ganov
ad435ba7ff
Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev
2013-04-16 21:41:09 +00:00
Wink Saville
bab000578d
am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
...
* commit 'c6f2d17a0a6f9b172ff91247db12bc39a601f81c':
Add mHasQuit to fix an NPE in StateMachine.
2013-04-16 13:37:18 -07:00
Wink Saville
c6f2d17a0a
Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev
2013-04-16 20:33:00 +00:00
Wink Saville
03812c7894
Add mHasQuit to fix an NPE in StateMachine.
...
After quiting mStateStack and other variables become
null so ignore all messages.
Bug: 8627228
Change-Id: I60150fb8023340768b38c2e72a8cbc982a59e0a8
2013-04-16 13:21:00 -07:00
Jaikumar Ganesh
6a622dcf18
am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev
...
* commit '37f58dccecd778f5af1f1f1db492c75ec5fcabd6':
Fix wrong index value.
2013-04-16 12:03:28 -07:00
Jaikumar Ganesh
37f58dccec
Merge "Fix wrong index value." into jb-mr2-dev
2013-04-16 18:59:32 +00:00
Jaikumar Ganesh
edb5242355
Fix wrong index value.
...
Rotation vector was at the wrong index value.
b/8165631
Change-Id: I50662befabf80393965c94a0335359019b98eb85
2013-04-16 11:59:07 -07:00
Chet Haase
b718735aae
am b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
...
* commit 'b2488931cbd25c0e9dbc648882e272048c075741':
Avoid repositioning unattached overlay views
2013-04-16 11:02:29 -07:00
Chet Haase
b2488931cb
Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev
2013-04-16 17:58:37 +00:00
Daniel Sandler
220fa85eac
am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
...
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
Finish annotating Notification.extras.
2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5
Merge "Finish annotating Notification.extras." into jb-mr2-dev
2013-04-16 01:38:54 +00:00
Kristian Monsen
46dedde94e
am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev
...
* commit '639857f7f42bb048b1dd8fbc4849e7b51402f629':
Fix for bug 8607049: Improve javascript dialogs for classic
2013-04-15 16:58:53 -07:00
Kristian Monsen
639857f7f4
Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev
2013-04-15 23:54:43 +00:00
Dianne Hackborn
f5cfab41c3
am a59a19ab: Merge "Fix issue #8512015 : VideoView\'s window animates when its position changes" into jb-mr2-dev
...
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
Fix issue #8512015 : VideoView's window animates when its position changes
2013-04-15 16:25:05 -07:00