Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,307 Commits 3 Branches 0 Tags
5cfee77e400a6e1f51b37e03ce090bc233f1bb8a
Commit Graph

63307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
5cfee77e40 am 8013fd39: Reconcile with ics-mr1-release 
* commit '8013fd391e0354c58b193373f5d2db2a22f94081':
 2012-02-21 15:10:34 -08:00
The Android Open Source Project
8013fd391e Reconcile with ics-mr1-release 
Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b
 2012-02-21 15:06:33 -08:00
Dianne Hackborn
536a3b185b am f08beab2: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit 'f08beab2d10bda159722aea6b01bf4320cff6480':
 2012-02-21 15:00:40 -08:00
Dianne Hackborn
210c1a262a am 2aae2d96: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '2aae2d9633dab528b74fb4d9c8266d82638e05ff':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:59:38 -08:00
Dianne Hackborn
2aae2d9633 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:57:55 -08:00
Dianne Hackborn
f08beab2d1 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
 2012-02-21 14:57:46 -08:00
Dianne Hackborn
01011c3d7c Fix issue #6037252: Screen shifts after all apps are upgraded 
Two things: (1) make sure the boot message is always positioned within
the entire unrestricted display, and (2) allow the dim background to go
on top of the nav bar when being used for the boot message (this latter
is really a hack that should be more generally fixed in the future).

Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
 2012-02-21 13:54:21 -08:00
Jean-Baptiste Queru
ad3102d06b am f3d94b44: am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'f3d94b4425615c08c3f9891726f0753142ce54de':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:33:20 -08:00
Jean-Baptiste Queru
f3d94b4425 am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'a91b052e16196436fcd3a24caa894718db4d10d6':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:30:46 -08:00
Jean-Baptiste Queru
a91b052e16 am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'fc24982a44d2b2b678fe5aa212b2e709d10e6413':
  Call onTimeChanged when AM/PM changed.
 2012-02-21 12:28:38 -08:00
Jean-Baptiste Queru
fc24982a44 Merge "Call onTimeChanged when AM/PM changed." 2012-02-21 07:21:53 -08:00
Tsu Chiang Chuang
7b306ae225 am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '90cfe0f2f1e0e54c876157862abc0a588ef84b93':
 2012-02-19 07:46:04 -08:00
The Android Automerger
9c0b825e83 merge in ics-mr1-release history after reset to ics-mr1 2012-02-17 16:38:41 -08:00
Tsu Chiang Chuang
c16d9de729 am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit 'a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
  fix NPE in race condition.
 2012-02-17 15:58:12 -08:00
Tsu Chiang Chuang
a626f8d61b am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:56 -08:00
Tsu Chiang Chuang
90cfe0f2f1 am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
 2012-02-17 15:55:44 -08:00
Tsu Chiang Chuang
2d559b5311 Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
49913d8c60 am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '8035db11ef3da209432b50dc178883ce4683336a':
 2012-02-17 15:27:46 -08:00
Adam Powell
c0d0dddc20 am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit 'fef000e3fa968a8dd165753f16c1c4cd38d59f33':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:26:56 -08:00
Adam Powell
8035db11ef am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:29 -08:00
Adam Powell
fef000e3fa am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-17 15:25:18 -08:00
Adam Powell
482ae5f238 Bug 6021294 - Contextual action bar animation tweaks 
Remove the right-to-left cascade effect from action mode menu
items. Animation time is now fixed at 300ms for scaling in menu items.

Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
 2012-02-17 15:18:01 -08:00
Jean-Baptiste Queru
058bd2ecbc am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '1d4c4d42edb92a3dd82238eafef23a0bfa0267d3':
  Return error code when composing PDU fails
 2012-02-17 13:22:56 -08:00
Jean-Baptiste Queru
4b3ec09b81 am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit '99ccf407bf7fc96eab9e1f747e0fa93391330438':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:22:54 -08:00
Jean-Baptiste Queru
1d4c4d42ed am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '44c1f012c4ffa75853a068963b212ee1c965b6ea':
  Return error code when composing PDU fails
 2012-02-17 13:18:34 -08:00
Jean-Baptiste Queru
99ccf407bf am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS
 2012-02-17 13:18:31 -08:00
Jean-Baptiste Queru
44c1f012c4 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
c2461eb32e Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
The Android Open Source Project
e380481381 am f5f5d61c: Reconcile with ics-mr1-release 
* commit 'f5f5d61c611b6f2c699ba472972e0b5c33c82402':
 2012-02-17 10:46:48 -08:00
Jean-Baptiste Queru
50ff08a24e am 8a33803d: am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit '8a33803df5477bb9bd20bfae8c7a7d0833f6d2a9':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:18:49 -08:00
Jean-Baptiste Queru
8a33803df5 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit 'a1ee18f1413471813f36a1d05927f5513c8931f5':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:13:05 -08:00
Jean-Baptiste Queru
a1ee18f141 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
The Android Open Source Project
f5f5d61c61 Reconcile with ics-mr1-release 
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
 2012-02-17 09:02:50 -08:00
The Android Open Source Project
a4ea7a8f20 am c30fdda0: Reconcile with ics-mr1-release 
* commit 'c30fdda052e82ca7b014b9817945e465cca78c75':
 2012-02-17 08:13:35 -08:00
The Android Open Source Project
c30fdda052 Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -08:00
Matthias Thomae
9962ca12fb Increase PDU parts buffer size for performance reasons 
Changed the size of the temporary buffer used when storing a PDU part
to 8192 bytes instead of the previous 256 bytes. This greatly
decreases the time needed to store relatively large PDU parts. The
times to store PDU parts were so long that we frequently ended up with
an ANR. This change resulted in a total time usage of ~1000 ms instead
of ~10000 ms for ~500 kB worth of data.

Change-Id: Ia02cb28e4fd9dfe3aaa1fa30ff37659951cbed93
 2012-02-17 11:56:27 +01:00
Marc Blank
cedcdc984c am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit 'd3ea7331041a4e0b30acb4d86d14318c407df53b':
 2012-02-16 16:57:34 -08:00
Marc Blank
cdbf0efcdc am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '970c74acb16529b73c03d93469472c3c3ba6af35':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:56:36 -08:00
Marc Blank
d3ea733104 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:41 -08:00
Marc Blank
970c74acb1 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:23 -08:00
Marc Blank
094bf51ec0 Use ' for apostrophe in HTML encoding DO NOT MERGE 
* We were using ' which is not correct

Chery-pick of CL: https://android-git.corp.google.com/g/165367
 2012-02-16 16:47:28 -08:00
The Android Automerger
75b223f2f8 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:26:06 -08:00
Dianne Hackborn
e669d6666a am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '1db7eeac74d1455991e1dc0f532b47276d0c679c':
 2012-02-16 14:46:41 -08:00
Tsu Chiang Chuang
4fe25f693a fix NPE in race condition. 
Change-Id: Ic1df67f8a5379ff1cd804fb55e143f078e369ccf
 2012-02-16 14:46:02 -08:00
Dianne Hackborn
804aa29795 am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:45:57 -08:00
Dianne Hackborn
1db7eeac74 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:44:03 -08:00
Dianne Hackborn
01810bbb67 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:43:43 -08:00
Dianne Hackborn
06a591cdd6 Fix last change -- don't call startInputInner() with lock held. 
Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
 2012-02-16 10:37:06 -08:00
The Android Open Source Project
9f78285290 am e113e793: Reconcile with ics-mr1-release 
* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':
 2012-02-16 10:13:52 -08:00
The Android Open Source Project
e113e793b3 Reconcile with ics-mr1-release 
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
 2012-02-16 10:10:14 -08:00