ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity
43,099 Commits 2 Branches 0 Tags 54 MiB
df0a4caa24
Commit Graph

43099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
df0a4caa24 Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc." 2012-01-25 16:15:43 -08:00
Dianne Hackborn
907e08f2de Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-01-25 15:14:50 -08:00
Gilles Debunne
8b80621ed5 Merge "Unbalanced batch edit begin and end leave TextView unresponsive" 2012-01-25 15:08:29 -08:00
Fabrice Di Meglio
27ee11b062 Merge "Update Javadoc for InputConnection.deleteSurroundingText()" 2012-01-25 14:52:40 -08:00
Gilles Debunne
26ec02b9c9 Merge "TextView's display list updated on layout" 2012-01-25 14:07:08 -08:00
Wink Saville
aa1e433e56 Merge "Add additional debug" 2012-01-25 14:04:59 -08:00
Wink Saville
10abf9cd54 Merge "Fix ClassCastException" 2012-01-25 13:45:02 -08:00
Nick Pelly
058cadde46 Merge "Add API's for normalizing MIME's and URI's." 2012-01-25 12:55:58 -08:00
Dianne Hackborn
5b941d0c0c Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 2012-01-25 12:29:17 -08:00
Jeff Brown
3b891312c8 Merge "Fix an inconsistent comment." 2012-01-25 11:52:48 -08:00
Robert Greenwalt
839d927da3 am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
  Filter our v6 address from tethering dns.
 2012-01-25 11:33:14 -08:00
Robert Greenwalt
424661c12a am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
 2012-01-25 11:30:39 -08:00
Robert Greenwalt
fa00205ed3 Merge "Filter our v6 address from tethering dns." into ics-mr1 2012-01-25 11:28:30 -08:00
Jean-Baptiste Queru
f3b2a34e71 am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:33:42 -08:00
Jean-Baptiste Queru
0df964696c am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
105b4f71a9 am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:27:41 -08:00
Jean-Michel Trivi
4534f5645b Merge "Update AudioTrack.stop() javadoc" 2012-01-25 09:46:01 -08:00
Jean-Baptiste Queru
a8ed1d4f9a Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Roman Nurik
ab1ac41b47 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
cbafdc6c15 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
df80c5b180 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
47623f569f 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
6c48805c1c 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
6616127218 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
0cc595295c Merge "resolved conflicts for merge of 67cda1a0 to master" 2012-01-25 08:54:59 -08:00
George Mount
e7e77db01c Merge "Fix auto-complete for content-editable fields." 2012-01-25 07:37:30 -08:00
Mathias Agopian
843861643e Merge changes Ib6b6da1d,I6d9a466a 
* changes:
  improve SurfaceFlinger dumpsys
  hack up frame latency measurement
 2012-01-24 19:22:08 -08:00
Mathias Agopian
82d7ab6c7e 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
1767e74ae7 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
1c4b467cf1 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Jim Miller
20ae68fee2 Merge "Fix 5907237: dismiss keyguard after the camera app launches." 2012-01-24 17:41:04 -08:00
Svetoslav Ganov
b53d4d4d0d Merge "Fixing a typo in the NumberPicker documentation." 2012-01-24 17:02:23 -08:00
Fabrice Di Meglio
64e7a4c887 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
50f88f8766 Merge "More AudioManager tests" 2012-01-24 16:23:22 -08:00
Winson Chung
591bf35ade Merge "Call ActivityManager to get the proper icon dpi." 2012-01-24 15:51:53 -08:00
Jamie Gennis
e8696a40e0 hack up frame latency measurement 
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
 2012-01-24 15:41:50 -08:00
Jeff Sharkey
eeae1de29e Merge "Match WIFI_P2P data usage." 2012-01-24 15:38:54 -08:00
Svetoslav Ganov
c9e150a167 Merge "NumberPicker should not throw an exception if no enough values for wrapping." 2012-01-24 15:27:12 -08:00
Jean-Baptiste Queru
9364b5c01e 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
0fb6ec284a 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
0e5f19af0c 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
2a92cabc90 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
3f59ab7cd0 resolved conflicts for merge of 67cda1a0 to master 
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
 2012-01-24 15:02:06 -08:00
Jean-Baptiste Queru
afcc5fa9df Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Chris Craik
3629c6dc6b Merge "Allow profiling of animation performance" 2012-01-24 14:15:25 -08:00
Adam Powell
f1bdb7be7d Merge "Update ShareActionProvider to clear the sharing activity when the task is reset." 2012-01-24 13:58:41 -08:00
Svetoslav Ganov
f0e9830e1c Merge "Removing unused imports and swiching off deprecated APIs" 2012-01-24 13:57:05 -08:00
Daniel Sandler
08c109508e 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
4ca203ab44 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Eric Laurent
321400743a 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