Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,808 Commits 3 Branches 0 Tags
84677dff59a663204743343e92fcab1ddbd057f4
Commit Graph

31448 Commits

Author SHA1 Message Date
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
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Alan Viverette
b9f2e99f26 Send tab selection event from ScrollingTabContainerView. 
BUG: 8185409
Change-Id: I37c59906d2950d09e0e39ca91ffad34279dd9526
 2013-04-15 16:16:11 -07:00
Chet Haase
face742d31 Avoid repositioning unattached overlay views 
Adding a view to an overlay usually entails removing the
view from its current parent, if it has one. ViewOverlay.add() will
do this automatically. At the same time, it will check to see whether
the parent view is in a different global location than the overlay's
host view, and will adjust the added view accordingly. This enables
the caller to simply toss a view into an overlay and have it end up
at the same global position on the screen.

the problem is that the current code doesn't bother to check whether
the old parent is attached. If that parent has been removed from the
view hierarchy before this overlay operation, then it will show up as
being at (0,0) in the window, not its old location. This results in the
view being mis-positioned in the overaly.

Fix is simple: if the view's old parent is not attached, simply remove
it from that parent before adding it to the overlay; don't try to compensate
for its position which is based on wrong information.

Issue #8620319 Overlay should only use relative window locations for onscreen parents

Change-Id: I414038a6c355dfd58f9766b007ac44d535ef1889
 2013-04-15 15:15:59 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes 
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
 2013-04-15 15:07:21 -07:00
Amith Yamasani
460071f806 am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev 
* commit '919e36d5f689f6a73a879ebd72465f68c1625062':
  Allow non-system apps to use restricted accounts
 2013-04-15 14:02:15 -07:00
Amith Yamasani
e993ae197b Allow non-system apps to use restricted accounts 
Anyway they need to request account access and user will be asked to approve access to the account
at runtime.

Bug: 8617168
Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
 2013-04-15 13:42:57 -07:00
Daniel Sandler
f45564ee72 Finish annotating Notification.extras. 
This covers all useful data from the basic Builder as well
as each of the Styles that is not otherwise captured on the
Notification object itself.

Extras are now prettyprinted in dump() output.

Bug: 8270485
Change-Id: I47fc50860dab6409793f57e904cc60296310d5cf
 2013-04-15 15:05:08 -04:00
Kristian Monsen
98dedf7ccc Fix for bug 8607049: Improve javascript dialogs for classic 
Make a common JsDialogHelper for classic and chromium webview
Improve on before unload dialog

Change-Id: Ib9711e4f95189ef8b2b31fc64aec7c0cb535d0e4
 2013-04-15 10:22:34 -07:00
Ben Murdoch
e41c3cdb9c am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 
* commit '7e157f321c690e41f0f18a556f989fd20709469f':
  Deprectate WebViewDatabase password methods.
 2013-04-15 08:52:46 -07:00
Ben Murdoch
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00:00
Amith Yamasani
6064c5cf22 am e1375908: Rename isUserLimited to isLinkedUser 
* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:22:09 -07:00
Amith Yamasani
e1375908a5 Rename isUserLimited to isLinkedUser 
A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
 2013-04-13 16:48:35 -07:00
Amith Yamasani
19c95bcc76 am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
  Introducing manifest flag requiredAccountType
 2013-04-13 15:56:31 -07:00
Amith Yamasani
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Dianne Hackborn
00c4c67069 am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev 
* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
  Add a little more resource load tracing.
 2013-04-12 18:07:12 -07:00
Dianne Hackborn
301e95f2e1 Merge "Add a little more resource load tracing." into jb-mr2-dev 2013-04-13 01:03:47 +00:00
Amith Yamasani
ccbe389b4d Introducing manifest flag requiredAccountType 
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.

Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
 2013-04-12 17:52:42 -07:00
Dianne Hackborn
0acc1931d3 Add a little more resource load tracing. 
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
 2013-04-12 17:49:17 -07:00
Mathias Agopian
4c87edfe4d am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 
* commit '1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
  always trigger a re-draw when updating the transparent region hint
 2013-04-12 17:32:32 -07:00
Mathias Agopian
1763d6f957 Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 2013-04-13 00:28:16 +00:00
Jaikumar Ganesh
d347d51976 am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev 
* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.
 2013-04-12 17:25:41 -07:00
Jaikumar Ganesh
02087754fb Merge "Fix race condition and disable call." into jb-mr2-dev 2013-04-13 00:22:07 +00:00
Svetoslav Ganov
dd03b6dcb7 am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev 
* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.
 2013-04-12 17:17:59 -07:00
Svetoslav
640769589b am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 
* commit '72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
  Respect custom view drawing order when dispatching hover events.
 2013-04-12 17:17:57 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Svetoslav
72ab9b8017 Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 2013-04-13 00:14:56 +00:00
Kenny Root
019895e2e4 am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:09:57 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Dianne Hackborn
18e99d1d5f am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 
* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
  Add new resources trace, also trace apk dex loading.
 2013-04-12 17:03:03 -07:00
Mathias Agopian
54e3d38490 always trigger a re-draw when updating the transparent region hint 
since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.

Bug: 8581533

Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b
 2013-04-12 17:01:44 -07:00
Svetoslav
0e5e9aa8e5 Respect custom view drawing order when dispatching hover events. 
1. The event dispatch methods should respect the child drawing order.
   Hover event dispatch in ViewGroup was not repsecting this order.

bug:8606799

Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef
 2013-04-12 16:59:03 -07:00
Dianne Hackborn
15fed390c4 Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 2013-04-12 23:58:50 +00:00
Amith Yamasani
b0511d47eb am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
d04215c440 am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:23:22 -07:00