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

64904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Eric Laurent
7eeaf3f07a Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 2012-01-24 11:49:39 -08:00
Eric Laurent
41773d4655 Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 2012-01-24 11:49:16 -08:00
Daniel Sandler
2e481b9146 Stop showing "No internet connection" when there is one. 
In particular, even though the mobile data network isn't
routing packets (and therefore is not an internet
connection), we want to show the PLMN anyway:

  [MOBILE RSSI] Carrier  [WIFI RSSI] WiFi SSID

This change also improves the following cases:

 - Combines "No internet connection" from wifi and mobile
   into one single string in airplane mode:

     [AIRPLANE] No internet connection.

 - Removes "No internet connection" from the mobile string
   when wifi is on in airplane mode, making a nice compact
   display in this case:

     [AIRPLANE] [WIFI RSSI] WiFi SSID

Bug: 5903914
Change-Id: I477821d2c5e9922252dd6bcb3ed494c8c57d99b0
 2012-01-24 14:45:40 -05:00
George Mount
fbcd98305e Fix auto-complete for content-editable fields. 
Bug 5608192
 Text content for content-editable fields is
 retrieved and given to the WebViewInputConnection
 so that suggestions will work appropriately.
 Edits with WebViewInputConnection uses
 replaceTextfieldText just like WebTextView.

 Webkit Change: Idcf8d99d9e844669ea68122a7509990f5ce8dcca

Change-Id: I5f1fcc13a0abe204db301e027954dc47c3a48db0
 2012-01-24 11:43:40 -08:00
Robert Greenwalt
67cda1a0ec am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
  Use the carrier-given dns addrs for tethering.
 2012-01-24 11:42:21 -08:00
Robert Greenwalt
f449ea9e96 Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 2012-01-24 11:40:19 -08:00
Dianne Hackborn
08cec4ee46 am a5853595: am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit 'a5853595165a6395ca41bbc17a3dd88e12259ad1':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
 2012-01-24 11:39:49 -08:00
Dianne Hackborn
8c190f76fc am 29cd79c7: am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 
* commit '29cd79c7b0fecd2753fc27405794c0d5b5314302':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
 2012-01-24 11:37:24 -08:00
Daniel Sandler
6f203807e0 am 9dc211af: am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 
* commit '9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
  Detect and repair invalid layouts in the navigation bar.
 2012-01-24 11:37:21 -08:00
Dianne Hackborn
a585359516 am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
 2012-01-24 11:37:02 -08:00
Dianne Hackborn
29cd79c7b0 am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 
* commit 'c986d6f01b00dd760ba1650918baadd24a6dc838':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
 2012-01-24 11:34:49 -08:00
Daniel Sandler
9dc211afbf am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 
* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
  Detect and repair invalid layouts in the navigation bar.
 2012-01-24 11:34:47 -08:00
Dianne Hackborn
47163685eb Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-24 11:33:15 -08:00
Dianne Hackborn
c986d6f01b Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 2012-01-24 11:33:06 -08:00
Daniel Sandler
a4474ae025 Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 2012-01-24 11:32:31 -08:00
Jeff Sharkey
63abc37356 Move network stats to FileRotator pattern. 
Split existing network stats into two separate classes: a recorder
which generates historical data based on periodic counter snapshots,
and a collection of historical data with persistance logic.

Recorder keeps a pending history in memory until outstanding data
crosses a specific threshold.  Persisting is handled through a given
FileRotator.  This pattern significantly reduces disk churn and
memory overhead.  Separate UID data from UID tag data, enabling a
shorter rotation cycle.  Migrate existing stats into new structure.

Remove "xt" stats until iptables hooks are ready.  Avoid consuming
Entry values when recording into NetworkStatsHistory.  Assign
operation counts to default route interface.

Introduce "Rewriter" interface in FileRotator with methods to enable
rewriteAll().  Introduce IndentingPrintWriter to handle indenting in
dump() methods.

Bug: 5386531
Change-Id: Ibe086230a17999a197206ca62d45f266225fdff1
 2012-01-24 11:13:14 -08:00
Dianne Hackborn
827951ac16 Merge "Add new test for showing very slow animations." 2012-01-24 11:12:37 -08:00
Dianne Hackborn
8a59b7f95f Add new test for showing very slow animations. 
Change-Id: Ibcc3e46a72210cf8a8e4cf5a932e2c9a7995f0f1
 2012-01-24 11:10:40 -08:00
Scott Main
3f3612985d am e7dc2898: am 4809f09f: docs: update fujitsu id, capitalize 
* commit 'e7dc2898c099bb1673f4bb0074b4d3b697699176':
  docs: update fujitsu id, capitalize
 2012-01-24 11:05:02 -08:00
Scott Main
ee7d0bcf44 am b790d1aa: am cdf14454: docs: add fujitsu/toshiba USB vendor id 
* commit 'b790d1aa2f741813b1556b71875dc453bc8c8010':
  docs: add fujitsu/toshiba USB vendor id
 2012-01-24 11:02:25 -08:00
Scott Main
e7dc2898c0 am 4809f09f: docs: update fujitsu id, capitalize 
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
  docs: update fujitsu id, capitalize
 2012-01-24 11:01:49 -08:00
Scott Main
b790d1aa2f am cdf14454: docs: add fujitsu/toshiba USB vendor id 
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
  docs: add fujitsu/toshiba USB vendor id
 2012-01-24 10:59:23 -08:00
Scott Main
4809f09f55 docs: update fujitsu id, capitalize 
Change-Id: I776bdf0af37baa98b2b2dd70c5950ea1e98d36ec
 2012-01-24 10:58:06 -08:00
Scott Main
cdf1445432 docs: add fujitsu/toshiba USB vendor id 
Change-Id: I7917035d8c3f4b0fc80b7c992fcdf085aa984b4f
 2012-01-24 10:54:50 -08:00
Gilles Debunne
3df0159987 Merge "Fix for AOOB in MeasuredText" 2012-01-24 10:46:58 -08:00
Gilles Debunne
a54b9641cd Merge "Restored selectAllOnFocus" 2012-01-24 10:42:09 -08:00
Jean-Baptiste Queru
d80cbb8c7b Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00