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

66152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
01797065ae am 28091796: am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit '28091796a651b19fed6eb291cef041f08d27f886':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-25 09:01:01 -08:00
Daniel Sandler
6785247322 am efbf376a: am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit 'efbf376afd9e37112dcd44c607d5e865da07eec7':
  Stop showing "No internet connection" when there is one.
 2012-01-25 09:00:58 -08:00
Eric Laurent
779d226702 am 172870f3: am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '172870f37dc233922757d35d3180071fa84c59ef':
  AudioFlinger: refine mixer sleep time logic
 2012-01-25 09:00:55 -08:00
Eric Laurent
fe63ab1109 am 9c7d56a7: am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '9c7d56a78ba819fdc8046ab87c82ee2b57d200b5':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-25 09:00:52 -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
468531a040 am afacb33f: Merge "resolved conflicts for merge of 67cda1a0 to master" 
* commit 'afacb33f7584ca2f762c2d15472917059c0e9503':
  Use the carrier-given dns addrs for tethering.
 2012-01-25 08:56:25 -08:00
Robert Greenwalt
afacb33f75 Merge "resolved conflicts for merge of 67cda1a0 to master" 2012-01-25 08:54:59 -08:00
George Mount
5a702e378e am 17d3f667: Merge "Fix auto-complete for content-editable fields." 
* commit '17d3f6679aa0589494f958b586e769ae64eb3bca':
  Fix auto-complete for content-editable fields.
 2012-01-25 07:39:52 -08:00
George Mount
17d3f6679a Merge "Fix auto-complete for content-editable fields." 2012-01-25 07:37:30 -08:00
satok
ba76101f3e am f43305fb: Do not spell check when the keyboard language is not supported by the current spell checker 
* commit 'f43305fb057e0818db456065fba9698e2163a762':
  Do not spell check when the keyboard language is not supported by the current spell checker
 2012-01-25 01:51:41 -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
Mathias Agopian
d84b69d8ce am 37c56b94: Merge changes Ib6b6da1d,I6d9a466a 
* commit '37c56b94c48f60369c0223869cf8d86839ec3816':
  improve SurfaceFlinger dumpsys
  hack up frame latency measurement
 2012-01-24 19:24:10 -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
Jim Miller
5eace76cb3 am c49da051: Merge "Fix 5907237: dismiss keyguard after the camera app launches." 
* commit 'c49da0510f5ac54b791bbd7ef5e07d109631fbd3':
  Fix 5907237: dismiss keyguard after the camera app launches.
 2012-01-24 17:42:47 -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
3e80ec3010 am 3ad77466: Merge "Fixing a typo in the NumberPicker documentation." 
* commit '3ad774667d33524d2d6d1472ded15f2c6d6f541d':
  Fixing a typo in the NumberPicker documentation.
 2012-01-24 17:04:47 -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
16989b17cc am e414613b: Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption" 
* commit 'e414613bb8d9b1ee0234a2b0858d6f447d0d956a':
  Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption
 2012-01-24 16:59:17 -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
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
4f2dd79a2f am 6de8b47b: Merge "More AudioManager tests" 
* commit '6de8b47b54c31ef22f454e66ec5d8dc5358d59c3':
  More AudioManager tests
 2012-01-24 16:26:08 -08:00
Jean-Michel Trivi
6de8b47b54 Merge "More AudioManager tests" 2012-01-24 16:23:22 -08:00
Winson Chung
f0caee266c am 2ca25cd6: Merge "Call ActivityManager to get the proper icon dpi." 
* commit '2ca25cd6d63f818c45e53370690fbf625524909a':
  Call ActivityManager to get the proper icon dpi.
 2012-01-24 15:53:48 -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
c83551ff6d am fa1a9162: Merge "Match WIFI_P2P data usage." 
* commit 'fa1a91628a706bbe51d91e0ccb9144df8b8529e6':
  Match WIFI_P2P data usage.
 2012-01-24 15:40:20 -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
Svetoslav Ganov
6a1acf02a3 am 7caffbcd: Merge "NumberPicker should not throw an exception if no enough values for wrapping." 
* commit '7caffbcd6a80e86901c4618c4acb0f1872d73022':
  NumberPicker should not throw an exception if no enough values for wrapping.
 2012-01-24 15:30: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
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
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
Chris Craik
a80fe1d230 am 9f46b112: Merge "Allow profiling of animation performance" 
* commit '9f46b11229169a9ea42a62f75e72ae54aa14dade':
  Allow profiling of animation performance
 2012-01-24 14:17:46 -08:00
Chris Craik
9f46b11229 Merge "Allow profiling of animation performance" 2012-01-24 14:15:25 -08:00
Adam Powell
5f1993a2d1 am 37e800d6: Merge "Update ShareActionProvider to clear the sharing activity when the task is reset." 
* commit '37e800d6883436a477f013f2f329d1ed296ef3bb':
  Update ShareActionProvider to clear the sharing activity when the task is reset.
 2012-01-24 14:10:10 -08:00
Svetoslav Ganov
1f29ed6d33 am 15a7bc62: Merge "Removing unused imports and swiching off deprecated APIs" 
* commit '15a7bc62e1ca0727781853adbaee1ae52e464b57':
  Removing unused imports and swiching off deprecated APIs
 2012-01-24 14:09:57 -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
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
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