17826 Commits

Author SHA1 Message Date
Jeff Sharkey
d20482de2f Merge "Add operation counts to network statistics." 2011-08-01 16:33:50 -07:00
Chia-chi Yeh
44dabe3da3 Merge "Revert "Unhide APIs for user space VPN."" 2011-08-01 14:09:58 -07:00
Chia-chi Yeh
e1538f0558 Revert "Unhide APIs for user space VPN."
This reverts commit 3c2529c717cda3df321c1d0d6abe23ac1f298ac9.

Change-Id: I37d4ea6c1079d337ede7ac567d88414a41fc1e11
2011-08-01 14:06:58 -07:00
Romain Guy
a7edc40faa Merge "Plug memory leak in EditText." 2011-08-01 14:02:54 -07:00
Romain Guy
e5ea4403ce Plug memory leak in EditText.
Change-Id: I0b42c23ceeaa958d02255945c35ff6807c177114
2011-08-01 14:01:37 -07:00
Bjorn Bringert
dbe55b722c Merge "Fix exception when a focused item is detached." 2011-08-01 13:39:30 -07:00
Jeff Brown
07c6cc7b7b Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943" 2011-08-01 12:14:24 -07:00
Luca Zanolin
7702a59344 Merge "Sort the suggestions based based on the length of the text they are attached too." 2011-08-01 09:51:29 -07:00
Mark Brophy
1ea6889136 Fix exception when a focused item is detached.
When a ListView has itemsCanFocus set, and scrolling moves the currently
focused item off the display, its focus is cleared. This is checked by
calling getDistanceToView().

However, it's possible that the view will have been recycled.  If so, it
will have been detached from the parent by calling
ViewGroup.detachViewFromParent.  Since this doesn't clear the view's
focus, we'll still try to call getDistanceFromView(), causing an
IllegalArgumentException since the view is not a descendant of the
ListView anymore.

Check whether the view is still a descendant before calling
getDistanceToView(). If it's not, we also need to clear the focus.

Bug: 4556022
Change-Id: Iebee56032223b70d714e2ec3bb7a19093ab5f81c
2011-08-01 16:32:03 +01:00
Luca Zanolin
e3f89c08f2 Sort the suggestions based based on the length of the text they are attached too.
When the suggestions are displayed, the shortest one will be at the top of the list, as they are the most relevant one.

Bug: 5006130

Change-Id: Id3ac3accce5198a6a58a0c3028ee5f77957ceac6
2011-08-01 09:57:25 +01:00
Mike Lockwood
e5d0495d52 MediaScanner: Move genre table management to MediaProvider
Fixes problems introduced with bulk insert support

Bug: 5092877

Change-Id: If3c0c9054d5effe0a1d7a75e85635b41ba1591f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-31 17:06:01 -04:00
Jeff Sharkey
a63ba59260 Add operation counts to network statistics.
Provide API to increment "operation counts" for a UID and tag, used
to eventually derive bytes/operation stats.  Internally is stored at
network layer, but should belong at data layer.  Switch profiling
to use data layer stats, which are emulated by summarizing network
layer details.

Read packet counts from new /proc/ columns and collect them into
NetworkStatsHistory.  Prevent double-counting by ignoring values from
first snapshot.  Watch for duplicate /proc/ entries.  Update tests
to verify packet and operation counters.

Bug: 5052136, 5097392
Change-Id: I1832f65a2b8a9188f8088f253474a667c21a2f09
2011-07-29 22:24:01 -07:00
Romain Guy
1a7b1158c5 Trim HardwareRenderer memory more frequently.
Change-Id: I92e72ce5da324f9ffcfdf7a54d8b368c2531799c
2011-07-29 15:35:58 -07:00
Svetoslav Ganov
0ef92056b7 Merge "Improving accessibility feedback for two state widgets." 2011-07-29 14:06:44 -07:00
Kristian Monsen
abecca9c60 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
ecfeebebff Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Kristian Monsen
0d6c6a73c6 Part of fix for bug 4997380: Some error types unknown to SslError
Use the new SslError chromium error codes parser.

Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
2011-07-29 20:10:21 +01:00
Gilles Debunne
9ba79560bf Merge "New interaction model for suggestions" 2011-07-29 11:47:12 -07:00
Amith Yamasani
44df62c441 Merge "Don't submit a query if it's whitespace only." 2011-07-29 11:28:37 -07:00
Christopher Tate
e0fe39387a Merge "Require the current backup pw in all backup/restore operations" 2011-07-29 11:20:45 -07:00
Svetoslav Ganov
7650259a59 Improving accessibility feedback for two state widgets.
1. Added population of sensible text for the state of the
   two state controls such as CheckBox, Switch, etc. This
   is important since if they are in a layout manager which
   fires an accessibility event there should be a description
   of the widget.

bug:5092552

Change-Id: Ie3ca955653563496b84db379ae23a23fe88089a8
2011-07-29 10:45:05 -07:00
Dianne Hackborn
bb96bf6e47 Merge "Various work on out of memory managment." 2011-07-29 10:43:26 -07:00
Robert Greenwalt
be591d736e am 86574d66: am 0d8acea9: Make copy-constructor make deep copy.
* commit '86574d66dacc09c9b5a0a0ab2623ec01704b6fc8':
  Make copy-constructor make deep copy.
2011-07-29 09:24:38 -07:00
Robert Greenwalt
86574d66da am 0d8acea9: Make copy-constructor make deep copy.
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
2011-07-29 09:20:51 -07:00
Daniel Sandler
53f2531ba7 Merge "The fullest of fullscreen modes." 2011-07-29 05:45:55 -07:00
Dianne Hackborn
c68c913d35 Various work on out of memory managment.
- Improve how we handle processes that have shown UI, to take care
  of more cases where we want to push them into the background LRU
  list.
- New trim memory level for when an application that has done UI
  is no longer visible to the user.
- Add APIs to get new trim memory callback.
- Add a host of new bind flags to tweak how the system will adjust
  the OOM level of the target process.

Change-Id: I23ba354112f411a9f8773a67426b4dff85fa2439
2011-07-29 02:06:46 -07:00
Jean Chalard
3970f6833d Merge "Fix a bug where a provider could be never released." 2011-07-28 19:36:32 -07:00
Romain Guy
c564042a3e Merge "Don't create hw layers when there's no hw context. Bug #5093805" 2011-07-28 19:25:29 -07:00
Romain Guy
ea83503e86 Don't create hw layers when there's no hw context.
Bug #5093805

Change-Id: Ia58b3381c83b9a200e80020e5c1b9c337ad6c35c
2011-07-28 19:24:37 -07:00
satok
f7be31ee10 Merge "Handle the existing binds to spell checkers correctly." 2011-07-28 18:09:59 -07:00
Christopher Tate
728a1c4d5e Require the current backup pw in all backup/restore operations
Specifically, we now also require the current password to confirm any
restore operation.

Bug 4901637

Change-Id: I39ecce7837f70cd05778cb7e0e6390ad8f6fe3f3
2011-07-28 18:04:07 -07:00
satok
6be6d7548f Handle the existing binds to spell checkers correctly.
Change-Id: I32efce9f8c09b5a829b0431e8c444fc54b03b440
2011-07-29 09:57:07 +09:00
Matthew Xie
6903a7de88 Merge "Provide an API to set the friendly name of a remote device." 2011-07-28 17:46:45 -07:00
Chris Craik
318fecea61 Merge "use pageswap callback to sync WebTextView with drawing of page" 2011-07-28 17:23:57 -07:00
Wu-cheng Li
38e16c6e74 Merge "Add frame metadata parameter to camera data_callback." 2011-07-28 17:23:35 -07:00
Robert Greenwalt
0d8acea9bb Make copy-constructor make deep copy.
Used to grab immutables but now will copy the data so the result
is mutable and we don't get crashes.

bug:5051667
Change-Id: I0878bf8c58069055f528121541d1911f404cbe49
2011-07-28 17:21:25 -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
Matthew Xie
269e81a563 Provide an API to set the friendly name of a remote device.
BluetoothDevice setName overwrite the locally cached remote name.
The changed name is saved in the local storage so that the change
is preserved over power cycle.
bug 5081605
Change-Id: I486966033828d153bfb1076a99e274c8a7f41636
2011-07-28 15:56:11 -07:00
Chris Craik
5cf78f7bd8 use pageswap callback to sync WebTextView with drawing of page
bug:5008210

Redraw the WebTextView when the page swaps (and thus the background is updated)
That way it updates at (approximately) the same time as the page. In software
rendering, do as before.

Depends on following external/webkit change:
https://android-git.corp.google.com/g/#change,124606

Change-Id: I59d7266a49d0ba734efdb88fef5fafe68aecfbce
2011-07-28 15:42:58 -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 Brown
a1b2418e64 Tweak hover for better accessibility and compatibility.
Bug: 5087943

Change-Id: I5533c18ec042b8d9cb590d8d3b22ce4a391c910d
2011-07-28 14:47:38 -07:00
Gilles Debunne
646f856ec8 New interaction model for suggestions
Double tap and long press both start a text selection mode. The previous 'Paste'
popup window associated with insertion handle is now also used in selection mode.
It offers a new 'Replace' option that will popup the suggestion list.

The HC paste/side/nopaste layout are no longer used. For the new action popup
window, I also chose not to make the new background / text appearance styles
themable in order to avoid the same problem in case this design evolves again.

Known problems:
the popup is not moved when the TextView is scrolled.
the final visual style may change
the "ADD TO DICT" option is missing from the suggestion list
no interaction with the spell checker
- There are different bugs open for each of these

Change-Id: I167841f5ac017227fe4efa616eb935247250871a
2011-07-28 13:59:31 -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