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

2208 Commits

Author SHA1 Message Date
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
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual 
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
 2012-05-02 11:38:57 -07:00
Svetoslav Ganov
42c5cb3028 Adding title for the date picker dialog if the calendar is not shown. 
1. The date picker dialog shows spinners and a mini calendar on
   tablet but on on phone the calendar is not show and the user
   does not know the day of the week otherwise show on the mini
   calendar.

bug:5264972

Change-Id: I06aeb7ba1ad34d4e99628d9586ff2777e981c963
 2012-05-02 01:02:43 -07:00
Adam Powell
53dc75339a am a60ce985: am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev 
* commit 'a60ce9859366b66bcec2a16414abbd670d988de1':
  API modifications for TaskStackBuilder
 2012-05-01 19:17:28 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder 
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
 2012-05-01 18:51:40 -07:00
Brett Chabot
d733ec3b28 Prevent binder flooding when sending instrumentation status. 
There is a long standing bug in the InstrumentationTestRunner where executing
many fast-running tests causes it to hang with 'FAILED BINDER TRANSACTION'
messages in the logs.

This commit changes the Instrumentation status updates to be sent synchronously.

Bug 1796494

Change-Id: Ifd1af31158353d727bd88283eaeb90933ba1a3ca
 2012-05-01 12:33:28 -07:00
Jeff Sharkey
e6b4e6556e am ff6b7588: am 6ee3fe88: Merge "Migrate ringtone playback to SystemUI." into jb-dev 
* commit 'ff6b7588ab575035ba0d21bbb21f78e3c8761112':
  Migrate ringtone playback to SystemUI.
 2012-04-27 16:32:39 -07:00
Jeff Sharkey
6ee3fe8849 Merge "Migrate ringtone playback to SystemUI." into jb-dev 2012-04-27 16:28:32 -07:00
Michael Jurka
33d7560561 am 235013f5: am f0fb68d8: Merge "Make APIs to get global search provider public" into jb-dev 
* commit '235013f5518593da2502bb78fee0063f5e559ac6':
  Make APIs to get global search provider public
 2012-04-27 14:47:12 -07:00
Michael Jurka
f0fb68d8c9 Merge "Make APIs to get global search provider public" into jb-dev 2012-04-27 14:41:27 -07:00
Michael Jurka
3f5cfcf2d9 Make APIs to get global search provider public 2012-04-27 14:23:48 -07:00
Jeff Sharkey
098d580cc2 Migrate ringtone playback to SystemUI. 
Introduce IRingtonePlayer, which handles playback for both Ringtone
objects and Notifications. SystemUI now hosts this player, which it
registers with AudioService. It also keeps MediaPlayer instances
warm, and cleans them up after stop() or Binder death.

Move both Ringtone and NotificationManagerService to play back audio
through this new interface.

Bug: 6376128, 6350773
Change-Id: I1dcb86d16ee3c4f07cdb2248d33dcff4ead3609a
 2012-04-27 14:15:05 -07:00
Adam Powell
c3b1b64897 am 75e8637f: am f2d75bc0: Merge "Use finishAffinity for automatic up navigation" into jb-dev 
* commit '75e8637f44cf11dd0fd5e646ab67095a71822bf4':
  Use finishAffinity for automatic up navigation
 2012-04-27 11:06:43 -07:00
Adam Powell
897b1dd610 Use finishAffinity for automatic up navigation 
Change-Id: I2ac1971e82c499e8bafe13fcc113c5594c34864b
 2012-04-26 19:53:41 -07:00
Dianne Hackborn
0e0d7a7462 am de5c3359: am 73214f61: Merge "Fix launcher icon size for tvdpi." into jb-dev 
* commit 'de5c3359a643f9f289fda35fbb6219fdb6c21adf':
  Fix launcher icon size for tvdpi.
 2012-04-26 19:37:30 -07:00
Dianne Hackborn
73214f619a Merge "Fix launcher icon size for tvdpi." into jb-dev 2012-04-26 19:33:37 -07:00
Dianne Hackborn
eb08322953 am 4883d755: am 493f74e5: Merge "Add new Activity.finishAffinity() method." into jb-dev 
* commit '4883d755ebee295af57eb7294db0146db153b2a5':
  Add new Activity.finishAffinity() method.
 2012-04-26 19:31:13 -07:00