Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,929 Commits 3 Branches 0 Tags
df74ef8ea51641d60e763deee73db76a8897b5d3
Commit Graph

2224 Commits

Author SHA1 Message Date
Adam Powell
d509da93e4 am 5fac4ca4: am ef31e7ca: Fix for toggling menu item visibility outside of create/prepare menu 
* commit '5fac4ca4652e1a5211ef15c706feb64b9f250aa3':
  Fix for toggling menu item visibility outside of create/prepare menu
 2012-05-09 10:09:05 -07:00
Chris Wren
b992f4a1f7 am 2779c4c1: am 195ba504: Merge "Clear out any existing buttons before adding the set of requested actions." into jb-dev 
* commit '2779c4c1f1580b13bd9bb29695451b58b381b1e3':
  Clear out any existing buttons before adding the set of requested actions.
 2012-05-09 10:08:48 -07:00
Kenny Root
c72b502d89 am 83ea8609: am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev 
* commit '83ea86091bf94571912694c7caf8be1c21727f91':
  Add encryption parameters to package installation
 2012-05-09 10:08:19 -07:00
Adam Powell
c1e8244f72 am c5967ab8: am e601efd3: Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev 
* commit 'c5967ab8defdb199b95317a3c67957f8d7a0aacb':
  Fix a bug in Activity Up navigation dispatching
 2012-05-09 10:07:46 -07:00
Dianne Hackborn
709d138d2f am eef61216: am 8e11051a: Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 
* commit 'eef61216183b77842d06533fcc661020c0032d2d':
  Tweak anim API to automatically call Intent.setSourceBounds().
 2012-05-08 15:02:13 -07:00
Dianne Hackborn
2a8650bdca am 009e6e6b: am bae365c1: Merge "Fix issue #6319312: Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev 
* commit '009e6e6b5e83f18cd691d69dc5f08e04bfccf059':
  Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()...
 2012-05-08 15:01:27 -07:00
Adam Powell
ef31e7cab5 Fix for toggling menu item visibility outside of create/prepare menu 
Allow applications to transition from 0=>1+ visible menu items outside
of onCreatePanelMenu/onPreparePanel. Previously, having 0 visible items
at this point would require an invalidation of the options menu.

Bug 6452605

Change-Id: I6cbfc46d0e5ec42b8d78ee516e9b57fdeaf1a890
 2012-05-08 10:01:35 -07:00
Chris Wren
195ba5047c Merge "Clear out any existing buttons before adding the set of requested actions." into jb-dev 2012-05-08 07:34:12 -07:00
Chris Wren
2c22eb0a49 Clear out any existing buttons before adding the set of requested actions. 
Bug: 6459557
Change-Id: Id19050e7280208d4f98c1aabe8087c6fe6c8d72a
 2012-05-08 09:49:13 -04:00
Kenny Root
29bb27ef90 Merge "Add encryption parameters to package installation" into jb-dev 2012-05-07 18:41:27 -07:00
Adam Powell
e601efd375 Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev 2012-05-07 17:40:09 -07:00
Adam Powell
07304f5299 Fix a bug in Activity Up navigation dispatching 
Propagate the return value from onNavigateUp as the result of
onMenuItemSelected. This fixes a bug where the action bar Up nav
button clicks would not be propagated to support lib FragmentActivity
or other activity subclasses that rely on processing otherwise
unhandled onMenuItemSelected events.

Change-Id: Id879dd1756ed06b8a7b720ebf0eae2a8ddc66ca8
 2012-05-07 17:32:44 -07:00
Anonymous Coward
ceb1b0bfae Add encryption parameters to package installation 
Change-Id: Ic9f8ab9f8110f08bb3c00725cfce5b8ee7b766f3
 2012-05-07 16:34:49 -07:00
Dianne Hackborn
8e11051a06 Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 2012-05-07 16:12:44 -07:00
Dianne Hackborn
d367ca88ee Tweak anim API to automatically call Intent.setSourceBounds(). 
Also don't retain the source bounds in recent tasks, since it
has no meaning there and it would be better when relaunching an
activity to have a new bounds set based on wherever it is now
being launched from.

Change-Id: Ia90c04ee98a888a7f725b038abe23d71e2b12800
 2012-05-07 15:54:58 -07:00
Dianne Hackborn
755c8bfbff Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()... 
...without onPause() in between

There was a bug in the handling of "always finish activities" where we
would go through destroying activities while in the middle of updating
the activity stack.  This would result in the activity behind the
non-full-screen activity being created and then immediately destroyed,
which things were not expecting.

Change-Id: Idaa89089f7b1af7eb747d7b8f9f394beeb2d23fa
 2012-05-07 15:06:09 -07:00
Daniel Sandler
d4ff15ac60 am f3fda077: am fafce1f9: Merge "Add number back to legacy notifications." into jb-dev 
* commit 'f3fda0778c3deee7955f2c3caef2ac71cd9b647b':
  Add number back to legacy notifications.
 2012-05-07 06:04:38 -07:00
Daniel Sandler
fafce1f9f5 Merge "Add number back to legacy notifications." into jb-dev 2012-05-07 05:58:55 -07:00
Romain Guy
3ce1747583 am 2e353b35: am 2db084fa: Merge "Dialog not dismissed when tearing down dialog fragment." into jb-dev 
* commit '2e353b35f0b0a346e54aaec91de455d5f1cef213':
  Dialog not dismissed when tearing down dialog fragment.
 2012-05-06 14:11:28 -07:00
Romain Guy
2db084fa95 Merge "Dialog not dismissed when tearing down dialog fragment." into jb-dev 2012-05-06 14:06:05 -07:00
Svetoslav Ganov
44bfdd88a7 Dialog not dismissed when tearing down dialog fragment. 
1. The dismiss implementaton in Dialog was posting a message
   on the main thread to perform the real dismiss work. The
   goal of this was to allow calling dismiss() from multiple
   threads. The side effect of this is that when dialog fragment
   is dismissed the dialog is not dimissed until the current
   loop on the main thread is completed. However, during rotation
   of the screen the current activity has to be restarted, hence
   all fragments whould be removed. In the destruction process
   the dialog grament requests from the dialog to dismiss but
   since this is asynchromous, the code in
   ActivityThread#handleDestroyActivity detects a leaking window
   since the dialog window is still not removed and removes that
   window. Now when the dialog removal message is processed on
   the next loop we get an exception that the window has already
   been removed. Now if Dialog#dismiss() is called from the
   main thread the call goes right though otherwise a message is
   posted.

bug:5911682

Change-Id: I449d6dd75a84c0ff29ea13dac7d163219cc38341
 2012-05-06 13:21:33 -07:00
Pin Ting
1462fe6a38 am aa048661: am d0c66f6a: Merge "Fix javadoc." into jb-dev 
* commit 'aa048661742fe337d30f9ef8a024ef22d1a18ff8':
  Fix javadoc.
 2012-05-06 07:16:41 -07:00
Pin Ting
d0c66f6a8f Merge "Fix javadoc." into jb-dev 2012-05-06 07:12:02 -07:00
Romain Guy
1f5c8a12c5 am f9d5ee55: am 5b972e73: Merge "Don\'t check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev 
* commit 'f9d5ee556a7cc588b19ca3ba92931bd562699f1c':
  Don't check whether dismiss() is called on the UI thread Bug #6436642
 2012-05-04 17:31:09 -07:00
Romain Guy
5b972e730f Merge "Don't check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev 2012-05-04 17:27:11 -07:00
Romain Guy
05e1c3a691 Don't check whether dismiss() is called on the UI thread 
Bug #6436642

An app invoking dismiss() during a draw pass could cause crashes.
This change makes the code simpler too.

Change-Id: Iba89a8522e23d02f87697cfeec6cc713a1462669
 2012-05-04 17:18:29 -07:00
Dianne Hackborn
8575723dcc am 967b361c: am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 
* commit '967b361cd384761e7f6a2e0a29f1da8f74b6ec9b':
  Fix issue #6426645: API REVIEW: android.app.ActivityOptions
 2012-05-04 16:36:36 -07:00
Dianne Hackborn
6ad5b4f637 Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 2012-05-04 16:10:16 -07:00
Chris Wren
3cb341539b am 32c513b7: am 3c5f9243: The BigTextStyle should never render mContentText 
* commit '32c513b72925c810ac82f96965f7e4d2ede3589a':
  The BigTextStyle should never render mContentText
 2012-05-04 13:41:54 -07:00
Chris Wren
3c5f924327 The BigTextStyle should never render mContentText 
Change-Id: Ifcbb0868871741bd78c5ebf31408143aaf732b98
 2012-05-04 13:32:18 -07:00
Chris Wren
bd41275441 am cdea2a3e: am d213524d: Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev 
* commit 'cdea2a3e654543ecdf27528d505787770c1b5feb':
  Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract.
 2012-05-04 13:02:05 -07:00
Chris Wren
d6297dbfe9 Add an alternate title that can be used in the overflow of a InboxStyle. 
Always hide contentText for BigTextStyle and InboxStyle.
Style cannot be used without specialization, it should be abstract.

Bug: 6428978
Bug: 6274137
Bug: 6317471
Change-Id: I21531a94494f891a058a477805b177e736b921cf
 2012-05-04 12:45:38 -07:00
Dianne Hackborn
ddc52a80b5 Fix issue #6426645: API REVIEW: android.app.ActivityOptions 
Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b
 2012-05-04 12:04:40 -07:00
Daniel Sandler
b4b2223fa1 Add number back to legacy notifications. 
Bug: 5816717
Change-Id: I52c98143378c315dec5b525cb3d96c214ee8196e
 2012-05-04 13:31:33 -04:00
Chris Wren
e1cb5e0674 am 6145ec08: am 1243b967: Merge "rework big text to handle gmail use case" into jb-dev 
* commit '6145ec08372940e3d0b84b68a5acd6c496217d4a':
  rework big text to handle gmail use case
 2012-05-03 07:51:41 -07:00
Chris Wren
b323cc47ef am 6908d1f6: am 71964645: Merge "Allow the Notification.Builder to carry around a Style to apply at build" into jb-dev 
* commit '6908d1f6d4aa441652563544a53189df5395b664':
  Allow the Notification.Builder to carry around a Style to apply at build
 2012-05-03 07:51:39 -07:00
Chris Wren
e4a2a4f142 rework big text to handle gmail use case 
Change-Id: I3175e198bd6f39025f4257454b43c459ed1e38f5
 2012-05-03 09:40:02 -04:00
Chris Wren
fbd96ba9ba Allow the Notification.Builder to carry around a Style to apply at build 
Change-Id: I5e848504b6d0444ee349ecea893ceae571dda796
 2012-05-03 09:40:02 -04:00
Mike Cleron
9f14083c76 am 546c0a4a: am 841a37aa: Merge "Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called." into jb-dev 
* commit '546c0a4ae1978aab98c606272c813a538831cd8a':
  Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called.
 2012-05-03 00:02:09 -07:00
Mike Cleron
841a37aa5b Merge "Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called." into jb-dev 2012-05-02 23:56:08 -07:00
Adam Powell
f019595151 Clarify documentation about when Activity#onCreateNavigateUpTaskStack 
will be called.

Bug 6427237

Change-Id: I5c41e4a694b39c03fd642586472838e2f9a0281d
 2012-05-02 21:39:31 -07:00
Jeff Sharkey
d07852ef39 am ee1ef538: am b829f097: Merge "Allow adding of completed empty files." into jb-dev 
* commit 'ee1ef5383fcd4ce44eea7692308785ad97dbdad2':
  Allow adding of completed empty files.
 2012-05-02 19:42:37 -07:00
Jeff Sharkey
b829f09737 Merge "Allow adding of completed empty files." into jb-dev 2012-05-02 19:37:51 -07:00
Svetoslav Ganov
8e687eb400 am a33d9a8a: am fb58a6d9: Merge "Adding title for the date picker dialog if the calendar is not shown." into jb-dev 
* commit 'a33d9a8a805946edb299b6b5fb31051f50d26a5c':
  Adding title for the date picker dialog if the calendar is not shown.
 2012-05-02 17:51:28 -07:00
Svetoslav Ganov
fb58a6d93c Merge "Adding title for the date picker dialog if the calendar is not shown." into jb-dev 2012-05-02 17:46:34 -07:00
Jeff Sharkey
33f95eda3d Allow adding of completed empty files. 
Bug: 5281354
Change-Id: I375c3c7ff4ccbb554204ad53a90d35ff4790af6c
 2012-05-02 17:07:54 -07:00
Jeff Sharkey
4ed162e672 am 0fdcadf2: am 9a671137: Merge "Set tmpdir to application cache directory." into jb-dev 
* commit '0fdcadf28e265f0992214cd3f0cdfd2a5c5dba8d':
  Set tmpdir to application cache directory.
 2012-05-02 16:19:22 -07:00
Jeff Sharkey
9a671137dc Merge "Set tmpdir to application cache directory." into jb-dev 2012-05-02 16:12:49 -07:00
Jeff Sharkey
e1d330a071 Set tmpdir to application cache directory. 
Otherwise File.createTempFile() uses /sdcard which most apps don't
have write access to.

Bug: 6347289
Change-Id: Ibde191a63e4dbb9b03437406f8c999f192bcfa21
 2012-05-02 13:47:37 -07:00
Adam Powell
98423989b8 am 56de3296: am 0cd4f671: Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 
* commit '56de329630384891f6ebc3a623128e8261957388':
  Fix documentation of Activity#navigateUpTo() to describe its actual behavior.
 2012-05-02 12:07:15 -07:00