Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,943 Commits 3 Branches 0 Tags
9c50bbcf342bc6e2f282934b75dcad3803b96f03
Commit Graph

19075 Commits

Author SHA1 Message Date
Fred Quintana
9c50bbcf34 am 029749e2: am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom 
* commit '029749e2ad4f9554f009ab36ddd91a388a5f8b80':
  An extra is being written as one type and read as the wrong type.
 2011-09-19 17:35:31 -07:00
Fred Quintana
029749e2ad am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom 
* commit 'acfd5ebb49bde9f64c604dfca5cbed8cafa64594':
  An extra is being written as one type and read as the wrong type.
 2011-09-19 17:33:20 -07:00
Fred Quintana
acfd5ebb49 Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom 2011-09-19 17:30:44 -07:00
Fred Quintana
a77253a417 An extra is being written as one type and read as the wrong type. 
Bug: 5342556
Change-Id: I664bd84546cb8da2936c5afe65381336a97ef5cd
 2011-09-19 16:26:37 -07:00
Fred Quintana
577f439ed4 am d30d2aae: am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent() 
* commit 'd30d2aae108a132ac6ee04cdf29cbec50cc73320':
  Fixed the javadoc for AccountManager.newChooseAccountIntent()
 2011-09-19 14:02:09 -07:00
Dianne Hackborn
2c2ab5864f Fix issue #5260129: Suggestion strip in Talk app not showing all the time 2011-09-19 13:59:39 -07:00
Fred Quintana
d30d2aae10 am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent() 
* commit 'd88324d8ab8b98bbc2c21551be3a8981ee431181':
  Fixed the javadoc for AccountManager.newChooseAccountIntent()
 2011-09-19 13:59:21 -07:00
Fred Quintana
d88324d8ab Fixed the javadoc for AccountManager.newChooseAccountIntent() 
Change-Id: Ieb358fa3be46d793de1e04452819477cec786b5b
 2011-09-19 11:46:33 -07:00
John Reck
9ac88c4de0 am 2210fff4: Merge "Bringing back the \'cache" 
* commit '2210fff475e2d4ef6f5cf20eaa0a183058bfb68a':
  Bringing back the 'cache
 2011-09-19 11:09:36 -07:00
John Reck
2210fff475 Merge "Bringing back the 'cache" 2011-09-19 11:07:28 -07:00
Fred Quintana
9bb9cdd17f am 45ae3e50: am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom 
* commit '45ae3e50ec8672a85edfd89827334987d0862ee0':
  Continuation of the unified account chooser flow.
 2011-09-19 10:47:44 -07:00
Fred Quintana
45ae3e50ec am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom 
* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
  Continuation of the unified account chooser flow.
 2011-09-19 10:46:03 -07:00
Dianne Hackborn
b2aef1bcbd am ada259eb: Merge "Fix issue #5260129: Suggestion strip in Talk app not showing all the time" 
* commit 'ada259ebeec388183c7341c95331e59802b70281':
  Fix issue #5260129: Suggestion strip in Talk app not showing all the time
 2011-09-19 10:45:30 -07:00
Fred Quintana
79a33ad49e Merge "Continuation of the unified account chooser flow." into ics-factoryrom 2011-09-19 10:43:59 -07:00
Dianne Hackborn
bc82385706 Fix issue #5260129: Suggestion strip in Talk app not showing all the time 
Change-Id: Ibac6138f3b3b0c3850a30d2c432495aa57b7f3f1
 2011-09-19 10:41:43 -07:00
Philip Milne
cfb1805e49 am a9390979: Merge "Fix for http://b/issue?id=5297155" 
* commit 'a93909792c6f9657780a4cc358c20eda88a94a1b':
  Fix for http://b/issue?id=5297155
 2011-09-19 10:19:50 -07:00
Philip Milne
a93909792c Merge "Fix for http://b/issue?id=5297155" 2011-09-19 10:18:36 -07:00
Amith Yamasani
2da3f88571 am 4943b3aa: Merge "Make Volume control non-modal and allow touches underneath to take effect." 
* commit '4943b3aa360033c0eae9e5b67c7491b25ea9ae07':
  Make Volume control non-modal and allow touches underneath to take effect.
 2011-09-19 10:06:02 -07:00
Amith Yamasani
4943b3aa36 Merge "Make Volume control non-modal and allow touches underneath to take effect." 2011-09-19 10:03:14 -07:00
Adam Powell
ff1a816657 am bd1bb1d0: Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest" 
* commit 'bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f':
  Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest
 2011-09-19 09:50:41 -07:00
Adam Powell
bd1bb1d075 Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest" 2011-09-19 09:47:01 -07:00
Jeff Sharkey
e56156eee5 am 4f92c9bb: Merge "Sample atomic network stats buckets, full poll." 
* commit '4f92c9bb8d8484fc9a0dfc1549beedbd1ae8bf01':
  Sample atomic network stats buckets, full poll.
 2011-09-19 09:44:06 -07:00
John Reck
0966dd22ec Bringing back the 'cache 
Bug: 5333083

Change-Id: I9b693ad0a0d4ee2979a7dabad6575ffada962b16
 2011-09-19 09:12:27 -07:00
Adam Powell
cbff417962 Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest 
Change-Id: Ic532785d2c52bf65c3884665ffc53aabdf3253b9
 2011-09-18 17:49:27 -07:00
Jeff Sharkey
34c73acf88 Sample atomic network stats buckets, full poll. 
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
 2011-09-18 16:27:21 -07:00
Jeff Sharkey
aaf301736e Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom 2011-09-18 16:20:00 -07:00
Jeff Sharkey
c57f411211 am ff2aff2a: am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom 
* commit 'ff2aff2ac18daa758e5d51a4fd58976ce5f66d46':
  Collect and persist tethering stats.
 2011-09-18 16:19:42 -07:00
Jeff Sharkey
1f0b13b9d6 DO NOT MERGE: Sample atomic network stats buckets, full poll. 
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
 2011-09-18 16:17:51 -07:00
Jeff Sharkey
ff2aff2ac1 am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom 
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
  Collect and persist tethering stats.
 2011-09-18 16:17:39 -07:00
Jeff Sharkey
3d1d57dcdb Merge "Collect and persist tethering stats." into ics-factoryrom 2011-09-18 16:15:51 -07:00
Adam Powell
e891e7ab87 am d413eb38: Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode" 
* commit 'd413eb3861aae87386d418e9af4875f6f330cd05':
  Fix bug 5333962 - Problems with no action bar/overlay action mode
 2011-09-18 15:40:41 -07:00
Adam Powell
d413eb3861 Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode" 2011-09-18 15:39:05 -07:00
Adam Powell
8ee6d7c20e Fix bug 5333962 - Problems with no action bar/overlay action mode 
Change the standalone action mode window for overlay mode to be of
TYPE_APPLICATION. (This also fixes a bug where overflow menus would
not work properly on these types of action mode bars.)

Set exitFadeDuration on btn_cab_done_holo_* drawables.

Remove no-window-focus override selector states for selectable item
backgrounds to allow proper touch feedback on windows that do not have
focus but that the user can interact with.

Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
 2011-09-18 15:34:00 -07:00
Mike Lockwood
1e0207674d resolved conflicts for merge of 2f7d7c9b to ics-aah 
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I851866d74ff9674bfb7ff652d8be65da342273c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-18 18:25:44 -04:00
Dianne Hackborn
2f7d7c9bdb Merge "Fix issue #5242779: Device not responding to touch on unlock screen" 2011-09-18 14:53:27 -07:00
Dianne Hackborn
38e29a61d0 Fix issue #5242779: Device not responding to touch on unlock screen 
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.

Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
 2011-09-18 14:52:52 -07:00
Irfan Sheriff
856877c28d am 04e3bb6d: Merge "Retain DNS information from DHCP request" 
* commit '04e3bb6d32e73a5b7a74186e643458de467ac596':
  Retain DNS information from DHCP request
 2011-09-18 13:33:56 -07:00
Irfan Sheriff
04e3bb6d32 Merge "Retain DNS information from DHCP request" 2011-09-18 13:31:12 -07:00
Philip Milne
f6679c88d1 Fix for http://b/issue?id=5297155 
. Make GridLayout dynamic (see below)
. Change access modifiers from private to package private
  (to remove access$XX methods generated by compiler)
. Make private internal classes final (+10% perf)
. Update javadoc and add limitations section
. Improve error diagnostics

The bug above highlights the fact that GridLayout is a static
rather than dynamic layout - i.e. that the structure of the
grid could not be changed once it had been set up. This fix changes
GridLayout to a dynamic layout in which changes to its orientation,
rowCount and columnCount properties may be effected between layout
operations.

This change does not require a change to GridLayout's public API.

Change-Id: If5643574422dcfd3a557ce4db2bb19498dc6ecd8
 2011-09-18 13:10:54 -07:00
Jeff Brown
5533184964 am 92061b70: am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom 
* commit '92061b70be48fabd8a1e5fbdbd3021211c820222':
  Can't stop the fling! Bug: 5335420
 2011-09-16 23:32:33 -07:00
Jeff Brown
92061b70be am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom 
* commit '79aa40302b643ee6c6227ee354a1b1378e721568':
  Can't stop the fling! Bug: 5335420
 2011-09-16 23:30:52 -07:00
Fred Quintana
b04fe4e82a Continuation of the unified account chooser flow. 
- made the UI match the spec
 - added ability to force the account chooser to appear
 - added ability to pass in a description that will override the stock one
 - added ability to pass in requiredFeatures for addAccount
 - added ability to pass in an authTokenType for addAccount

Bug: 5293377
Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5
 2011-09-16 22:55:08 -07:00
Irfan Sheriff
2c08ede34c Retain DNS information from DHCP request 
DHCP renewal can fail to fill DNS information. In such
a case retain info from DHCP request

Bug: 5314392
Change-Id: I2413f738be7c8c965ef9e7ffbc348e2738aa68b5
 2011-09-16 22:03:09 -07:00
Jeff Brown
b0c71eb9f5 Can't stop the fling! 
Bug: 5335420

Fixed a bug in VelocityTracker where the output velocity was
not being set to zero when not available.

Added a condition to ensure that the velocity is at least
the minimum fling velocity before continuing.  If not, then
the user is trying to stop the fling and scroll more precisely.

Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
 2011-09-16 21:43:58 -07:00
Jeff Brown
70e4a25904 am daa98fe9: Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924"" 
* commit 'daa98fe9f799fcb3d2fe90e400d9f722d64a5bbe':
  Revert "Forces AsyncTask to use the main looper Bug #5333924"
 2011-09-16 21:05:07 -07:00
Jeff Brown
daa98fe9f7 Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924"" 2011-09-16 21:03:15 -07:00
Jeff Brown
99f801da15 Revert "Forces AsyncTask to use the main looper Bug #5333924" 
This reverts commit 6dafefb0f4

This change is breaking the system on startup with an NPE.  Need to fix that first then resubmit.
 2011-09-16 20:44:06 -07:00
Amith Yamasani
284e630a9b Make Volume control non-modal and allow touches underneath to take effect. 
Bug: 5308506 "Video" App halts playback when volume slider is present
Change-Id: Ib0672384b9074af73d729d1f64db62e5a8882d80
 2011-09-16 18:24:47 -07:00
Romain Guy
af45bd56ac am 364a92eb: Merge "Forces AsyncTask to use the main looper Bug #5333924" 
* commit '364a92ebb06de563d2024af24538737d619606ab':
  Forces AsyncTask to use the main looper Bug #5333924
 2011-09-16 16:51:59 -07:00
Romain Guy
364a92ebb0 Merge "Forces AsyncTask to use the main looper Bug #5333924" 2011-09-16 16:50:22 -07:00