drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,086 Commits 1 Branch 0 Tags
Commit Graph

65086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
00c3aaa235 am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit '92aaf2431ccb8d5ef1eb456646742c736fa70266':
  docs: Android Design typo and grammar fixes
 2012-01-25 08:57:45 -08:00
Jean-Baptiste Queru
d452520464 am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
28091796a6 am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-25 08:57:32 -08:00
Daniel Sandler
efbf376afd am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
  Stop showing "No internet connection" when there is one.
 2012-01-25 08:57:27 -08:00
Eric Laurent
172870f37d am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '535b0264a4cfa790e549bd9cd09980788f1375f4':
  AudioFlinger: refine mixer sleep time logic
 2012-01-25 08:57:23 -08:00
Eric Laurent
9c7d56a78b am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-25 08:57:20 -08:00
Robert Greenwalt
afacb33f75 Merge "resolved conflicts for merge of 67cda1a0 to master" 2012-01-25 08:54:59 -08:00
George Mount
17d3f6679a Merge "Fix auto-complete for content-editable fields." 2012-01-25 07:37:30 -08:00
satok
f43305fb05 Do not spell check when the keyboard language is not supported by the current spell checker 
Bug: 5787064
Change-Id: I54a3955220bbe3dae999f6634ccd734e658e45c0
 2012-01-25 16:05:11 +09:00
Nick Pelly
ccae412ded Add API's for normalizing MIME's and URI's. 
Helps developers create well-behaved intents:
- lower case MIME data type
- strip parameters from MIME content types
- lowercase URI scheme

The new API's are
normalizeAndSetType()
normalizeAndSetData()
normalizeAndSetDataAndType()
Uri.normalize()
normalizeMimeType()

Change-Id: Ib5c907897f39b1f705bcc4c9103ba1e6f316380b
 2012-01-24 20:04:13 -08:00
Mathias Agopian
37c56b94c4 Merge changes Ib6b6da1d,I6d9a466a 
* changes:
  improve SurfaceFlinger dumpsys
  hack up frame latency measurement
 2012-01-24 19:22:08 -08:00
Mathias Agopian
1d99795d73 improve SurfaceFlinger dumpsys 
It is now possible to say:

dumpsys SurfaceFlinger --latency

to print latency information about all windows

dumpsys SurfaceFlinger --latency window-name

to print the latency stats of the specified window

for instance: dumpsys SurfaceFlinger --latency SurfaceView

The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.

The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.

Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
 2012-01-24 18:22:56 -08:00
Roman Nurik
92aaf2431c am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
  docs: Android Design typo and grammar fixes
 2012-01-24 18:11:12 -08:00
Roman Nurik
cf077fdd79 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Roman Nurik
5d3b0c7a7a docs: Android Design typo and grammar fixes 
Change-Id: Ice0eb216c985183e2f41c287ea5d1cc7af1f31f2
 2012-01-24 17:51:17 -08:00
Jim Miller
c49da0510f Merge "Fix 5907237: dismiss keyguard after the camera app launches." 2012-01-24 17:41:04 -08:00
Svetoslav Ganov
3ad774667d Merge "Fixing a typo in the NumberPicker documentation." 2012-01-24 17:02:23 -08:00
Jim Miller
3868cee0b9 Fix 5907237: dismiss keyguard after the camera app launches. 
This fixes a bug where either the home screen or the last app run shows
briefly while we wait for the camera app to launch.  Instead, we have
ActivityManager dismiss keyguard once the camera app is up and running.

Change-Id: I1c2986ad84024dce675216a76c19c937c3e2828d
 2012-01-24 16:59:54 -08:00
Fabrice Di Meglio
e414613bb8 Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption" 2012-01-24 16:57:21 -08:00
Jean-Michel Trivi
a701da8eba Update AudioTrack.stop() javadoc 
Add more information on the behavior of
  android.media.AudioTrack.stop()

Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
 2012-01-24 16:53:57 -08:00
Robert Greenwalt
03d58bc656 Filter our v6 address from tethering dns. 
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
 2012-01-24 16:44:50 -08:00
Fabrice Di Meglio
3941a22bfd Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption 
- use the first char of the "run" instead of the "string" for the BaseGlyphCount

Change-Id: I647528ec912bb69655cf301bbc73b66dc1a6fc82
 2012-01-24 16:44:00 -08:00
Jean-Michel Trivi
6de8b47b54 Merge "More AudioManager tests" 2012-01-24 16:23:22 -08:00
Winson Chung
2ca25cd6d6 Merge "Call ActivityManager to get the proper icon dpi." 2012-01-24 15:51:53 -08:00
Jamie Gennis
b335fad470 hack up frame latency measurement 
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
 2012-01-24 15:41:50 -08:00
Jeff Sharkey
fa1a91628a Merge "Match WIFI_P2P data usage." 2012-01-24 15:38:54 -08:00
Jeff Sharkey
3ca7481439 Match WIFI_P2P data usage. 
Bug: 5405891
Change-Id: I5b815d6fc25a2f26a86c39a43fde305fcc3fb65c
 2012-01-24 15:37:07 -08:00
Winson Chung
43e34f61f0 Call ActivityManager to get the proper icon dpi. 
Change-Id: Iaec2a9a3cc1ea5febe60e0b675f1deff8e77d011
 2012-01-24 15:27:17 -08:00
Svetoslav Ganov
7caffbcd6a Merge "NumberPicker should not throw an exception if no enough values for wrapping." 2012-01-24 15:27:12 -08:00
Jean-Baptiste Queru
e2594b8509 am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:15:36 -08:00
Jean-Baptiste Queru
a39461047e am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:15:33 -08:00
Jean-Baptiste Queru
4cd2b34327 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
fc2ea24b02 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:13:42 -08:00
Robert Greenwalt
81519e611a resolved conflicts for merge of 67cda1a0 to master 
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
 2012-01-24 15:02:06 -08:00
Svetoslav Ganov
08a9e9f20a Fixing a typo in the NumberPicker documentation. 
Change-Id: I3a76923d468ddd01cd1ed5521992479cee82c6f0
 2012-01-24 14:32:20 -08:00
Jean-Baptiste Queru
98539a4eba Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Chris Craik
9f46b11229 Merge "Allow profiling of animation performance" 2012-01-24 14:15:25 -08:00
Adam Powell
37e800d688 Merge "Update ShareActionProvider to clear the sharing activity when the task is reset." 2012-01-24 13:58:41 -08:00
Svetoslav Ganov
15a7bc62e1 Merge "Removing unused imports and swiching off deprecated APIs" 2012-01-24 13:57:05 -08:00
Svetoslav Ganov
aa47a6b35a Removing unused imports and swiching off deprecated APIs 
Change-Id: I08fd2c17bcad42f0216b140c0511f48a782c8018
 2012-01-24 13:55:35 -08:00
Geremy Condra
5bbd1d12a6 Removed intent logging from SearchDialog.java 
This fixes an issue in which URLs, including HTTPS URLs, were
being sent to logcat.

Change-Id: I85a0aab4d5d1c01cd21f99d88ce4ff343f836cd5
 2012-01-24 13:52:11 -08:00
Adam Powell
314419ccb9 Update ShareActionProvider to clear the sharing activity when the task 
is reset.

As per platform guidelines, when launching a sharing activity the Intent
flag FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET should be used.

Change-Id: I30bd3d20eb75aee7943b681dc2d9c7f44a04e919
 2012-01-24 13:46:45 -08:00
The Android Automerger
e914a0f49c merge in ics-mr1-release history after reset to ics-mr1 2012-01-24 13:33:01 -08:00
Chris Craik
702c6fdc47 Allow profiling of animation performance 
Also fixes manual testing mode
Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/159794/

Change-Id: I169e80f9b5328b1b5a7b0aeaf09652de67febd8d
 2012-01-24 13:25:49 -08:00
Daniel Sandler
416a1c1ada am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
  Stop showing "No internet connection" when there is one.
 2012-01-24 12:57:14 -08:00
Daniel Sandler
185c0ef7e4 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Svetoslav Ganov
3f9c9eab7b NumberPicker should not throw an exception if no enough values for wrapping. 
1. The selector wheel was throwing an exception if a client requires that it
   wraps its selector wheel if the number of values is less that the number
   of values shown in the wheel.  While wrapping makes no sense if the all
   possible values are already shown, we should not throw an exception,
   rather to ignore the request.

bug:5911190

Change-Id: Icd90cd39f66d9f39939801752bf1eb1eef8fe757
 2012-01-24 12:09:11 -08:00
Eric Laurent
535b0264a4 am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
  AudioFlinger: refine mixer sleep time logic
 2012-01-24 11:51:50 -08:00
Eric Laurent
dd347d515d am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-24 11:51:47 -08:00
Jeff Sharkey
629c6765ca Merge "Move network stats to FileRotator pattern." 2012-01-24 11:49:51 -08:00