Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,029 Commits 3 Branches 0 Tags
ce08bd76c8c8af34816d86264939ab2181bd6235
Commit Graph

20660 Commits

Author SHA1 Message Date
Matthew Xie
ce08bd76c8 am e0515aad: am 778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom 
* commit 'e0515aad3a51aa2eadce5c448f771d2372916939':
  Check null of pidPair to skip the case the service record has been removed
 2011-09-20 16:24:29 -07:00
RoboErik
d6814dd9cf am 0f337df1: am bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom 
* commit '0f337df1c06035ba463bf630357a92e62e698893':
  Add a warning to changing colors in the docs
 2011-09-20 16:24:06 -07:00
Jason Simmons
8d3538d016 resolved conflicts for merge of 0799e951 to ics-aah 
Change-Id: I4f968fa84aa395c63c28053ef0f489161530bf86
 2011-09-20 14:36:22 -07:00
Ben Murdoch
5f9a717a88 am f9580d59: Merge "Cleanup for bug 5278763" 
* commit 'f9580d594a489aab2a3bbaf8ffc1bdbbe3aaf8b6':
  Cleanup for bug 5278763
 2011-09-20 14:15:37 -07:00
Chih-Chung Chang
59ec02e87f am ed4cfe70: Merge "Fix 5224359: Add width and height to media store." 
* commit 'ed4cfe70ca165b6469d2c9fb1b5296afdff1faae':
  Fix 5224359: Add width and height to media store.
 2011-09-20 14:15:03 -07:00
Matthew Xie
e0515aad3a am 778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom 
* commit '778eccf4923571c77f158e92b2f5f0f7dfd21875':
  Check null of pidPair to skip the case the service record has been removed
 2011-09-20 14:14:29 -07:00
RoboErik
0f337df1c0 am bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom 
* commit 'bbb11b80106c8687f2833c3d4b538029fc0805e6':
  Add a warning to changing colors in the docs
 2011-09-20 14:14:11 -07:00
Matthew Xie
778eccf492 Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom 2011-09-20 13:55:48 -07:00
Dianne Hackborn
0799e951a6 Merge "Fix issue #5312624: Lock screen very flickery" 2011-09-20 12:37:10 -07:00
RoboErik
bbb11b8010 Merge "Add a warning to changing colors in the docs" into ics-factoryrom 2011-09-20 11:34:20 -07:00
Dianne Hackborn
bc1aa7bbc7 Fix issue #5312624: Lock screen very flickery 
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.

Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.

Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
 2011-09-20 11:20:31 -07:00
Ben Murdoch
f9580d594a Merge "Cleanup for bug 5278763" 2011-09-20 10:32:28 -07:00
Chih-Chung Chang
e1bf8efaff Fix 5224359: Add width and height to media store. 
Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
 2011-09-20 20:41:44 +08:00
Matthew Xie
dcbc97fc28 Check null of pidPair to skip the case the service record has been removed 
Check null of pidPair instead of pidPair.first which caused a nullpointer
exception. clean local variables after sending out STATE_OFF intent.
Check bluetooth state in removeServiceRecord.
bug 5330367

Change-Id: Ib0af8143223bea48d3f587cca18544c4aef29980
 2011-09-19 22:45:00 -07:00
Justin Ho
a0570496b4 am f2ff20e0: Merge "Tuning Overscroller\'s scroll curve Softer end + rounder curve with less contrast Bug: 5200575" 
* commit 'f2ff20e05baec2d9849c7456e8455a2671820f2a':
  Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575
 2011-09-19 18:07:29 -07:00
RoboErik
4f52061b51 Add a warning to changing colors in the docs 
Change-Id: Ia1fdfd5e2c31c5665fb08ccc389957b6af6f3736
 2011-09-19 18:06:34 -07:00
Justin Ho
f2ff20e05b Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575" 2011-09-19 18:06:13 -07:00
Justin Ho
a181bb4b8c Tuning Overscroller's scroll curve 
Softer end + rounder curve with less contrast
Bug: 5200575

Change-Id: Icff6ba3cf7ae052c80b2e80e2d2b07085fcb40ce
 2011-09-19 17:52:06 -07:00
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
Jean-Michel Trivi
d087beb08b am dede7074: am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom 
* commit 'dede70744ab53c81cd650a60c687150146d0ba6b':
  Fix bug 5300223 Lockscreen should recycle bitmaps
 2011-09-19 15:41:09 -07:00
Jean-Michel Trivi
dede70744a am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom 
* commit '6c03850616a6e87de3e1943e47605cc5ebb20e2b':
  Fix bug 5300223 Lockscreen should recycle bitmaps
 2011-09-19 15:39:31 -07:00
Jean-Michel Trivi
6c03850616 Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom 2011-09-19 15:37:23 -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
Jean-Michel Trivi
01d96bd2af Fix bug 5300223 Lockscreen should recycle bitmaps 
When receiving a new bitmap to display, the lockscreen should
 recycle the old bitmap (if any).

Change-Id: Ic4f65a797dfe7e3cae7a0559f6333cc99e2ae1e7
 2011-09-19 11:17:02 -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
Jean-Michel Trivi
84c7e31d7d am b3e6eab1: am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom 
* commit 'b3e6eab16153c28a30525a7c26fb7a153a5548f4':
  Bug 5300223 RemoteControlClient uses PendingIntent for media button events
 2011-09-19 10:03:56 -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
Jean-Michel Trivi
b3e6eab161 am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom 
* commit '2f153169594249738d63aa6e2897d257f6b7d71e':
  Bug 5300223 RemoteControlClient uses PendingIntent for media button events
 2011-09-19 09:51:29 -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
Jean-Michel Trivi
2f15316959 Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom 2011-09-19 09:46:32 -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