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

19117 Commits

Author SHA1 Message Date
Adam Powell
1ad36c30d4 am c3e4454f: Merge "Fix bug 5300621 - Share menu disappears in gallery" 
* commit 'c3e4454fdb57391c8d7c77a9d61381d0f4d857e8':
  Fix bug 5300621 - Share menu disappears in gallery
 2011-09-21 18:27:20 -07:00
Adam Powell
c3e4454fdb Merge "Fix bug 5300621 - Share menu disappears in gallery" 2011-09-21 18:26:13 -07:00
Adam Powell
823f074a73 Fix bug 5300621 - Share menu disappears in gallery 
ActionProviders (or action views) unfortunately had no way to report
that they had opened a sub-UI that would affect menu visibility
listeners used to hide action bars when not in use. This caused the
Gallery UI to hide its action bar when the share popup was open.

Add hidden API (to be made public later) to ActionProvider that can be
used to inform the menu system that a sub UI has opened or
closed. Account for this in menu visibility callbacks. Fix
ShareActionProvider to use this when its popup windows open and close.

Fix a regression where submenus were not properly reporting visibility
changes.

Change-Id: Ia6f45fb463ad106105c40d01f141c2e5c8b96f78
 2011-09-21 17:21:47 -07:00
Mangesh Ghiware
230b11b832 am f2bf48b7: Merge "Use overview scale when restored scale is 0." 
* commit 'f2bf48b7c6d9edfe4c391687e744484a5b65672f':
  Use overview scale when restored scale is 0.
 2011-09-21 15:22:01 -07:00
Mangesh Ghiware
f2bf48b7c6 Merge "Use overview scale when restored scale is 0." 2011-09-21 15:20:03 -07:00
Mangesh Ghiware
faab93d1ac Use overview scale when restored scale is 0. 
If restored scale and text wrap scale are set to 0 (meaning the previous
scale wasn't saved), set them to overview and reading level scale
respectively.

Bug: 5230909
Change-Id: If7724e9a0cd948c88d0a001728266a3282083bdc
 2011-09-21 14:57:11 -07:00
Wink Saville
0db163c9aa am d30f7372: am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom 
* commit 'd30f73725bf6f7b668244a0e51245a85005c3e9f':
  Reduce connectivity logging
 2011-09-21 14:16:10 -07:00
Wink Saville
d30f73725b am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom 
* commit '4aa8d943a970008915b703758743b107927d96fa':
  Reduce connectivity logging
 2011-09-21 14:14:28 -07:00
Wink Saville
4aa8d943a9 Merge "Reduce connectivity logging" into ics-factoryrom 2011-09-21 14:12:42 -07:00
Wink Saville
c9acde9aa6 Reduce connectivity logging 
Change-Id: I5d45b8fbcd01e42df7f2b1cf02fb5b226128abb8
 2011-09-21 11:05:43 -07:00
Gilles Debunne
453afc8ca3 am a80599f5: Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 
* commit 'a80599f5be394edd9f3918ba03c490850a1d9e7f':
  Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
 2011-09-21 11:02:10 -07:00
Gilles Debunne
a80599f5be Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 
This reverts commit 6e405f84b8.

Change-Id: I9593273d414aee1f9817f84b462cf45360ff19e3
 2011-09-21 10:58:03 -07:00
Chih-Chung Chang
a5f8b2b1c0 am 73d84df8: Merge "Fix 5229466: don\'t consume pointer events outside the window" 
* commit '73d84df819a5086cb7baa8f95872c6786c0e0df7':
  Fix 5229466: don't consume pointer events outside the window
 2011-09-21 02:28:25 -07:00
Chih-Chung Chang
d1396fbc64 Fix 5229466: don't consume pointer events outside the window 
Change-Id: Ifa3d1d5edd81346e6ca80e113f80914ee2c47055
 2011-09-21 15:56:26 +08:00
Gilles Debunne
82f3d6c6ee am 576b6bb2: Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 
* commit '576b6bb2f9a72cc7599a254818b8d6a1df25ecb5':
  Bug 5248215: Even though I turned off the Spelling correction, it still shows up
 2011-09-20 18:04:35 -07:00
Gilles Debunne
576b6bb2f9 Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 2011-09-20 18:02:45 -07:00
Svetoslav Ganov
bb7d74b49e am 4877b85a: Merge "ActivityChooserView not showing highest ranked target if default action not shown." 
* commit '4877b85aea6ae1e4c486e28fc5c684ea02fe82be':
  ActivityChooserView not showing highest ranked target if default action not shown.
 2011-09-20 17:43:42 -07:00
Svetoslav Ganov
4877b85aea Merge "ActivityChooserView not showing highest ranked target if default action not shown." 2011-09-20 17:41:59 -07:00
Svetoslav Ganov
0fb757440d am acee06fa: Merge "TextView not adding text to accessibility events." 
* commit 'acee06fa6297c456dba86e37ba715392a7f43c3b':
  TextView not adding text to accessibility events.
 2011-09-20 16:25:38 -07:00
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
Svetoslav Ganov
efab4e7f59 ActivityChooserView not showing highest ranked target if default action not shown. 
The view was not showing the highest ranked activity if the default action
button was not shown (happens if no history is present).

bug:5224159

Change-Id: I66536513e14496568ea2034467bd29ea4bc93cdb
 2011-09-20 15:13:35 -07:00
Svetoslav Ganov
acee06fa62 Merge "TextView not adding text to accessibility events." 2011-09-20 14:57:57 -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
Svetoslav Ganov
d37848af08 TextView not adding text to accessibility events. 
Reversed conditional.

bug:5342756

Change-Id: Ia2a523af6f7b12e27275e6095ea1b137768ea14c
 2011-09-20 14:03:59 -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
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