42353 Commits

Author SHA1 Message Date
Elliott Hughes
a7ac8be1f5 am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.
2013-07-11 10:16:46 -07:00
Ben Murdoch
e3f9071e0d Plumb View.getAccessibilityNodeProvider though WebViewProvider.
This is needed to make use of the new Accessibility implementation
in the Chromium WebView. nos for WebView Classic.

Change-Id: I96bd2426d2de3b26dc9b72d0fdbacefa9bbe20f7
2013-07-11 14:41:46 +01:00
Dianne Hackborn
9865ef1ba5 Merge "Add -c option to meminfo to dump a compact form." 2013-07-11 02:03:33 +00:00
Dianne Hackborn
20cdcee47d Add -c option to meminfo to dump a compact form.
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.

Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
2013-07-10 18:47:04 -07:00
Baligh Uddin
634c1cc6f8 Import translations. DO NOT MERGE
Change-Id: Ie5e451abf345a2dea6e4f970b24166f1ba7e205d
Auto-generated-cl: translation import
2013-07-10 18:24:25 -07:00
Kenny Root
37dca155aa KeySets: better rejection for badly-formed manifest
During testing, I typed in a <publicKey> tag incorrectly and it
clobbered the previously defined key entry since it still parsed the
subsequent <keyset> tag defining an alias.

This gives more information in the log when running into such parsing
errors.

Change-Id: Id3c8e85530b1a5e39f4a2cb6ea8bd5521cb6918f
2013-07-10 16:55:05 -07:00
Romain Guy
5fade8c69a Trace list view items management
Change-Id: If43ce115679c2bcacad26d6f59e3bfb655abff6e
2013-07-10 16:40:30 -07:00
Craig Mautner
fb20eb48aa Merge "Add convertToTranslucent to API." 2013-07-10 21:52:28 +00:00
Glenn Kasten
9b53db378a AudioTrack write() on a full buffer while paused returns 0
Change-Id: I85d44452cd8a5f87c7fc9b6a0858569cb5293eb4
2013-07-10 14:13:39 -07:00
Glenn Kasten
f7e0a370e7 Return correct status for android.media.AudioTrack.write(short[]...)
Bug: 9776374
Change-Id: If43c63a4ceeb8fef98708f0d42496d2fb90a21fd
2013-07-10 14:03:03 -07:00
Chet Haase
dc57d9dda5 Fix minor transition bugs
TransitionGroup.setDuration() was not propagating the new duration to
future child transitions correctly.

Also, Fade should restore a fully-opaque value when a transition ends, to prevent
the problem of mid-stream canceled transitions causing vie3ws to get stuck with partially
faded-in alpha values.

Issue #9755995 Transitions: TransitionGroup.setDuration() not handled correctly
Issue #9756655 Transitions: handle fading cancelation better

Change-Id: Id44569c6f4152a26ee382d04c30a2f035a1ebcf3
2013-07-10 12:14:54 -07:00
Adam Powell
0d21c220dd Merge "Fix ListMenuItemView regression from patch 8933efd49" 2013-07-10 19:07:15 +00:00
Adam Powell
c39451267b Fix ListMenuItemView regression from patch 8933efd49
Passing 'true' as the third parameter of LayoutInflater#inflate does
cause it to add the inflated view to the parent in a single step, but
it also changes the return value to be the root of the resulting
hierarchy after the add rather than the root of the inflated layout.

Return to adding the view to its parent as a separate step.

Bug 9754101

Change-Id: I7ca4c921993594931f5007af69d45e9ff06065df
2013-07-10 11:51:33 -07:00
Dianne Hackborn
8ce24f2a68 Merge "Add new location monitoring op, make some of app ops public." 2013-07-10 18:45:34 +00:00
Chet Haase
7df754e712 Remove unnecessary drawable code in CompoundButton
Some of the code in setButtonDrawable() was unnecessary, resetting
the button drawable state and then refreshing it. This caused many redundant
calls, which can add up, especially during inflation.

Change-Id: I873cf5eef697b5435a1b827cd68e5d836ee25124
2013-07-10 07:46:24 -07:00
Romain Guy
68389dee4e Merge "Unregister gralloc buffer immediately Bug #9406765" 2013-07-10 02:00:22 +00:00
Romain Guy
b2ed04a689 Unregister gralloc buffer immediately
Bug #9406765

Waiting for a GC to finalize the GraphicBuffer could cause ordering
issues

Change-Id: I7035a9eef52a6c3b44ab28f40a7b1fbdc83d2e20
2013-07-09 18:56:57 -07:00
Dianne Hackborn
1304f4ae32 Add new location monitoring op, make some of app ops public.
The new location monitoring op is to tell us when an application
is monitoring for any location changes.  It may be useful information
in addition to the more explicitly information about when location
data actually goes to the app.

Also make parts of AppOpsManager public for use by gcore.  It is
not available to third party apps.

Change-Id: Ib639f704258ffdd7f3acd7567350ed2539da628a
2013-07-09 18:17:27 -07:00
Elliott Hughes
dff4ec87e7 am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
2013-07-09 15:25:23 -07:00
Craig Mautner
5eda9b3301 Add convertToTranslucent to API.
Rename convertToOpaque to convertFromTranslucent. Add the
counterpart to Activity.convertFromTranslucent() for returning from
opaque to a translucent Activity. The caller should wait until
TranslucentConversionListener.onTranslucentConversionComplete() is
called before actually changing the background to translucent.

Change-Id: Id04b026bcc4dd8bad9a33a7af126e1bb28fb9c03
2013-07-09 14:50:12 -07:00
Elliott Hughes
befd0b1bdf Track libcore API change.
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
2013-07-09 14:46:18 -07:00
Chad Brubaker
f11e5d3476 Permissions to protect socket marking settings
Add the manifest entries for the net_mark group that protects marking
traffic as from another user in per user routing.

Change-Id: I97932a9e407467a7adc733caea8746a712bc6b68
2013-07-09 13:48:21 -07:00
Craig Mautner
607c6e2a56 Merge "Refactor ActivityThread cache - Baby step 1." 2013-07-09 20:25:16 +00:00
Craig Mautner
88c0589969 Refactor ActivityThread cache - Baby step 1.
Introduce ResourcesManager and ResourcesKey as standalone classes.
Move DisplayMetrics and Resources HashMaps from ActivityThread to
ResourcesManager.

Change-Id: I20cc6c0dd1b74667354839e5ac9a660f4ee2d00d
2013-07-09 09:36:42 -07:00
Satoshi Kataoka
42e230cdb4 Merge "Consolidate InputMethodUtils" 2013-07-09 14:42:18 +00:00
Satoshi Kataoka
b282726d86 Consolidate InputMethodUtils
Change-Id: Ib5a5f3af8ea9eaaa81697d13c20abe28121e7373
2013-07-09 23:20:06 +09:00
Dianne Hackborn
a4cc205ee8 More procstats work.
The historical data is now a more central part of the stats.
When a checkin happens, the data is not deleted, just marked
as checked in so we can continue to access it.

The default procstats dump is now a new "summary" mode that
shows a more useful set of data for all of the running processes.
By default the current and all committed states are shown; you
use "--current" to only show the current.  Use "--details" to
get the previous more detailed data (which now includes detailed
process data like the per-package data).

Also tweaked uid printing to be a little more compact.

Change-Id: I5414ea7c07134ebd5dc83f6f7b9f6e30151eda85
2013-07-08 18:06:24 -07:00
Mathias Agopian
d19db9a7c4 Merge "be more robust with handling unknown sensors" 2013-07-08 22:48:37 +00:00
Mathias Agopian
b25c0efad2 be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-07-08 15:24:09 -07:00
Jean-Baptiste Queru
414b02380d resolved conflicts for merge of 9058a6c8 to master
Change-Id: I361773dac17a551dd7b4c0b0e4e649ddf7612d90
2013-07-08 15:02:41 -07:00
Jean-Baptiste Queru
a2bbb9a7d1 am 6cd4281d: am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '6cd4281dae6c1de0196f79c6c155f75602de64f6':
  Fix typo in AlertController.java
2013-07-08 14:48:04 -07:00
Jean-Baptiste Queru
9058a6c881 am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
  FastScroller: Fix to use appropriate index
2013-07-08 14:43:01 -07:00
Jean-Baptiste Queru
6cd4281dae am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '65ba6d11e1f3ecf33a5b6e68ab8a6322e993b4d8':
  Fix typo in AlertController.java
2013-07-08 14:42:56 -07:00
Jean-Baptiste Queru
7e683ec6a5 am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit 'fa42e774bc48c3172023c8c49610baa469c19e39':
  FastScroller: Fix to use appropriate index
2013-07-08 14:28:45 -07:00
Jean-Baptiste Queru
65ba6d11e1 am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '1e7276ce35f68c2df10b52c8adf8adc2882b8671':
  Fix typo in AlertController.java
2013-07-08 14:25:06 -07:00
Jean-Baptiste Queru
fa42e774bc Merge "FastScroller: Fix to use appropriate index" 2013-07-08 21:24:06 +00:00
Jean-Baptiste Queru
1e7276ce35 Merge "Fix typo in AlertController.java" 2013-07-08 21:22:18 +00:00
Kenny Root
242f1f3fc6 Merge "KeySetManager: fix indentation" 2013-07-08 19:48:41 +00:00
Jean-Baptiste Queru
bb4991e6eb am db550fc9: am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit 'db550fc900eaf3a5a845dcd0c0bb0ead2b1582d6':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:44:50 -07:00
Jean-Baptiste Queru
db550fc900 am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit '0e545bf5502fde4fe2c96377829bd4c3f7c2d727':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:40:28 -07:00
Jean-Baptiste Queru
0e545bf550 am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
* commit '9775203b610267bf8cecaf7c00db68b73b529ced':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
2013-07-08 12:37:27 -07:00
Jean-Baptiste Queru
9775203b61 Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 2013-07-08 19:35:36 +00:00
Chris Craik
5bee57567b Merge "Use global references for Bitmap AndroidPixelRefs" 2013-07-08 19:20:18 +00:00
Chris Craik
0c20c3898a Use global references for Bitmap AndroidPixelRefs
bug:9621717

Because we're no longer holding onto Bitmaps Java side during
DisplayList lifetime, use global refs to keep the backing byte arrays
around.

Adds back bitmap buffer passing + native ref management removed by
3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9

Adds back globalRef-ing removed by
f890fab5a6715548e520a6f010a3bfe7607ce56e

Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
2013-07-08 11:08:02 -07:00
Kenny Root
2758e291c8 KeySetManager: fix indentation
Change-Id: I4fe67143bce30a7592c6a0f5a094172112bdfe43
2013-07-08 09:37:24 -07:00
Eric Laurent
7cf06209dc Headphones volume warning disabled by default
Enable headphone volume limitation explicitely for
countries where EN60950 is applicable.

Bug: 8877359.

Change-Id: Ida9e6678ee451350b826492f0085726003f0d39d
2013-07-03 17:59:03 -07:00
msg555
b264f5f83f Mixed delete/delete[].
Error found via valgrind.
2013-07-03 19:26:23 -04:00
Craig Mautner
ba5664ed92 Merge "Remove debug logging." 2013-07-03 20:04:10 +00:00
Baligh Uddin
7368bf9ebf Import translations. DO NOT MERGE
Change-Id: I59059107c587612def1a2e6a8aa07f62cf41d599
Auto-generated-cl: translation import
2013-07-03 11:36:26 -07:00