19214 Commits

Author SHA1 Message Date
Wu-cheng Li
38e16c6e74 Merge "Add frame metadata parameter to camera data_callback." 2011-07-28 17:23:35 -07:00
Adam Powell
80df829e35 Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize if activity handles orientation change" 2011-07-28 16:40:03 -07:00
Christopher Tate
0a779813e1 Merge "Support full-backup encryption and global backup password" 2011-07-28 16:28:21 -07:00
Irfan Sheriff
8d88cde56d Merge "Changed walled garden to better url" 2011-07-28 16:24:38 -07:00
Wu-cheng Li
f0d6a48c6a Add frame metadata parameter to camera data_callback.
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
2011-07-29 07:14:38 +08:00
Adam Powell
45c0b1954d Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize
if activity handles orientation change

Make sure that bar content height and sizing/layout parameters are
properly updated after a configuration change.

Change-Id: I886df5cd9a655ba1bd34fab2b48e8b5be67fcc32
2011-07-28 16:14:19 -07:00
Isaac Levy
88bae17cfd Changed walled garden to better url
Now checking for walled gardens using 204 error code on
http://clients3.google.com/generate_204

Change-Id: I0a00dc8b956f35f6695d2085c9f03ce40dc7e231
2011-07-28 16:07:05 -07:00
Christopher Tate
2efd2dbbac Support full-backup encryption and global backup password
If the user has supplied a backup password in Settings, that password
is validated during the full backup process and is used as an encryption
key for encoding the backed-up data itself.  This is the fundamental
mechanism whereby users can secure their data even against malicious
parties getting physical unlocked access to their device.

Technically the user-supplied password is not used as the encryption
key for the backed-up data itself.  What is actually done is that a
random key is generated to use as the raw encryption key.  THAT key,
in turn, is encrypted with the user-supplied password (after random
salting and key expansion with PBKDF2).  The encrypted master key
and a checksum are stored in the backup header.  At restore time,
the user supplies their password, which allows the system to decrypt
the master key, which in turn allows the decryption of the backup
data itself.

The checksum is part of the archive in order to permit validation
of the user-supplied password.  The checksum is the result of running
the user-supplied password through PBKDF2 with a randomly selected
salt.  At restore time, the proposed password is run through PBKDF2
with the salt described by the archive header.  If the result does
not match the archive's stated checksum, then the user has supplied
the wrong decryption password.

Also, suppress backup consideration for a few packages whose
data is either nonexistent or inapplicable across devices or
factory reset operations.

Bug 4901637

Change-Id: Id0cc9d0fdfc046602b129f273d48e23b7a14df36
2011-07-28 16:01:20 -07:00
Adam Cohen
c9c4c2dad6 Merge "Fixing widget notifyDataSetChanged() not getting called, issue 5092676" 2011-07-28 15:36:19 -07:00
Adam Cohen
2148d43eb2 Fixing widget notifyDataSetChanged() not getting called, issue 5092676
Change-Id: I61a034a77c0c9d07aba71bfabe7a0864ce92c2e9
2011-07-28 15:00:38 -07:00
Jeff Sharkey
c07cc99ebb Merge "Keep original DialogTitle color when resizing." 2011-07-28 14:16:50 -07:00
Svetoslav Ganov
8cbe6e8f12 Merge "Updating the data base upgrade/creation code for the new touch exploraion setting." 2011-07-28 12:29:29 -07:00
Adam Powell
7c8d19d53c Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes" 2011-07-28 11:58:21 -07:00
Adam Powell
88ab69780f Fix bug 5087752 - Maintain correct contrast against action bars in
inverse-bar themes

Add the actionBarWidgetTheme theme attribute. This lets a theme
specify a wrapper theme that can be used to create views that will
end up in the action bar so that the rest of the code can ignore
differences in contrast. (e.g. the inverse action bar themes.)

Apps can use ActionBar#getThemedContext() to obtain a Context with a
proper theme for views that will end up in the action
bar. MenuInflaters generated by Activities will automatically use this
to properly theme inflated action views.

Change-Id: Ib28c82bf47c25d446cca2a63f617b8a4a0afa6b2
2011-07-28 11:44:41 -07:00
Jeff Sharkey
5c848ce793 Keep original DialogTitle color when resizing.
Change-Id: Id9d3bf565cc5660ab37037e74be63221cd638ba6
2011-07-28 11:35:04 -07:00
Svetoslav Ganov
a28a16d1c2 Updating the data base upgrade/creation code for the new touch exploraion setting.
1. Update the database creation/upgrade code to take care of the new setting
   to enable touch exploration.

2. Made the tocuh exploration settings persistent to the cloud.

Change-Id: Ie24e9184b4a21869432d11d207cb6464fadbac3b
2011-07-28 11:26:02 -07:00
Svetoslav Ganov
a7ffaee298 Merge "AccessibilityNodeInfo reports no children for the topmost view in the tree." 2011-07-28 11:09:43 -07:00
Martijn Coenen
9b3c83fbad Add constant for NFC sharing settings screen.
Change-Id: Ibeea153442110542f05d1ece57a7dc6388a91fbf
2011-07-28 12:37:18 -05:00
Adam Powell
b03c4af05e Merge "Fix bug 5087980 - MenuItem#expandActionView should work from within onCreateOptionsMenu" 2011-07-28 10:02:14 -07:00
Kristian Monsen
77d739006a Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-28 06:50:40 -07:00
Jeff Sharkey
2043b01b20 Merge "Maintain separate "restrict background data" flag." 2011-07-27 22:08:02 -07:00
Jeff Sharkey
4664500de0 Maintain separate "restrict background data" flag.
Since "restrict background" depends on active networks, separate its
definition from setBackgroundDataSetting().

Bug: 4979025
Change-Id: I12bfe3a2e606375b39c67706270caa7a1bb0214e
2011-07-27 21:11:32 -07:00
Adam Powell
ccdd4ee44f Fix bug 5087980 - MenuItem#expandActionView should work from within
onCreateOptionsMenu

Initialize menu presenters early enough to respond to expanding an
action view within onCreateOptionsMenu.

Have SearchView show the IME as an async post to handle attempts to
show it while the UI is still in initial setup.

Change-Id: I77f3a94ed4397737edb5a7a15bf54993b6723f5e
2011-07-27 21:08:28 -07:00
Romain Guy
b6f7a27c59 Merge "Reclaim more memory, more often." 2011-07-27 18:53:32 -07:00
Romain Guy
65b345fa22 Reclaim more memory, more often.
Yay.

Change-Id: I04557ad575c307a55088549f48f0e9ad994b7275
2011-07-27 18:51:50 -07:00
Chia-chi Yeh
fcbb492486 Merge "Unhide APIs for user space VPN." 2011-07-27 18:35:51 -07:00
Jeff Sharkey
06a2895b58 Merge "Grant AID_NET_BW_STATS to system service." 2011-07-27 18:09:42 -07:00
Dave Santoro
1d55c3343d Added ACCOUNT_TYPE_AND_DATA_SET pseudo-column.
This was added to simplify some logic in the provider and app, as
there are places that can simply compare the concatenation of the
account type and data set.

Also added a DATA_SET extra for contact creation, to allow for this
value to be passed around via intents.

Bug 5077096

Change-Id: Ia0634cfcf4590fd90ccb5cb99360c38c86f08d25
2011-07-27 17:16:12 -07:00
Romain Guy
c8ec222cd8 Merge "Destroy layers and flush layers cache when a window is destroyed." 2011-07-27 16:31:19 -07:00
Jeff Sharkey
e516893097 Grant AID_NET_BW_STATS to system service.
NetworkManagementService is reading stats /proc/ files, which are now
being protected by GID.

Bug: 5087530
Change-Id: I29b35a97ab621999544b6acc8ad4cf72ee053b79
2011-07-27 16:30:00 -07:00
Romain Guy
6d7475d666 Destroy layers and flush layers cache when a window is destroyed.
Change-Id: I3fa1bc3ff50fb99e3d2e490925bd6b0a0f809fff
2011-07-27 16:29:39 -07:00
Svetoslav Ganov
93b2182a2e AccessibilityNodeInfo reports no children for the topmost view in the tree.
1. My previous change to restrain AccessibilityNodeInfo to report children
   if it is root namespace did not take into account that the tompost view
   i.e. the decor view actually is a root namespace. Adding check to allow
   the info to report children of rthe topmost view but do not do so if a
   descendant is flagged as root namespace.

bug:5086988

Change-Id: Ib82b8ebe5a2c287ab1c5333d130ec50eb9ced78c
2011-07-27 16:02:55 -07:00
Kenny Root
4f35092af5 Merge "Move extract native libraries to JNI code" 2011-07-27 15:54:51 -07:00
Jeff Brown
3d5a703db8 Merge "Report the external display size to the input reader." 2011-07-27 15:54:50 -07:00
Jeff Brown
be922d6006 Merge "Handle stylus buttons and tool types." 2011-07-27 15:54:41 -07:00
Jeff Sharkey
d02fa35e8c Merge "Revise data limit notifs, watch kernel alerts." 2011-07-27 15:52:24 -07:00
Adam Powell
257466d4e2 Merge "Bug 5076788 - Optimize the building and invalidation of menus" 2011-07-27 15:47:04 -07:00
Chris Craik
24f2936d35 Merge "Use WebTextView overlay to render text fields/areas much faster" 2011-07-27 15:46:44 -07:00
Adam Powell
89b09da7b3 Bug 5076788 - Optimize the building and invalidation of menus
Fix cases that weren't batching menu presenter changes correctly.

Have FragmentManager invalidate the options menu less often.

Change-Id: Ia66fcd09ada8b0a084ad6b08d4340a8fa0c8fc5d
2011-07-27 15:37:58 -07:00
Svetoslav Ganov
e1b9259190 Merge "Not user generated accessibility events can change the interrogation allowing window." 2011-07-27 15:24:10 -07:00
Scott Main
812634c236 cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3
docs: clarify framelayout class summary, issue 5055437

Conflicts:

	core/java/android/view/View.java
	core/java/android/widget/FrameLayout.java

Change-Id: Ia446d2d4cc798757d7aea104cfaf75fc2315dc50
2011-07-27 13:22:35 -07:00
Dianne Hackborn
f2fa907e1f Merge "Fix issue #4466531: onServiceConnected() not called after..." 2011-07-27 12:19:40 -07:00
Scott Main
36193d09a8 cherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8
docs: revise ActionBar class summary and add a few links to dev guide docs

Change-Id: I14df84b16d7bdab85aa74d8b8211e988b0519115
2011-07-27 11:21:33 -07:00
Chris Craik
e3e7a88b4d Use WebTextView overlay to render text fields/areas much faster
bug:5008210

Still has the following issues:

* colors are always black & white

* ignores centering, word wrap from text area

* gray background text (such as with instant search) and other textfield effects
  aren't shown

The DebugFlags.DRAW_WEBTEXTVIEW can still be used to overlay red text over the
input box.

Change-Id: I7f22321c31b9edbc5351cac13f2e17b0ee19d563
2011-07-27 11:19:14 -07:00
Amith Yamasani
84935dc2c0 Merge "Make sure that suggestions are queried on focus or tapping." 2011-07-27 10:54:15 -07:00
Amith Yamasani
377fe39329 Merge "Handle callbacks to CollapsibleActionViews that are in an actionLayout." 2011-07-27 10:53:25 -07:00
Jeff Sharkey
693d0427b7 Merge "Avoid sync when UID network is disconnected." 2011-07-27 09:41:39 -07:00
Jeff Sharkey
41ff7ec824 Revise data limit notifs, watch kernel alerts.
Teach NetworkPolicy limits to "snooze" when requested by user, and
notify with both dialog and notification.  Register for network alerts
through NMS to trigger updates immediately instead of waiting for
next stats update.

Enforce that all NetworkPolicy are unique on a template basis, and
move SCREEN_ON/OFF broadcasts to background thread.  Launch SystemUI
and Settings directly instead of using actions, and include full
NetworkTemplate in extras.

Tests to verify notification and snooze behavior.

Bug: 5057979, 5023579, 4723336, 5045721
Change-Id: I03724beff94a7c0547cb5220431ba8d4cd44d077
2011-07-27 09:31:39 -07:00
Gilles Debunne
a94b9ad23a Merge "Bug 4987014: a tap outside dismisses the text suggestion popup" 2011-07-27 09:31:02 -07:00
Eric Laurent
d8d3276a29 Merge "Fix issue 4604090: notification sound interrupted." 2011-07-27 09:02:47 -07:00