drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,810 Commits 1 Branch 0 Tags
Commit Graph

76810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
05b50149ab Fix classpath of eclipse projects for layoutlib. 
This is due to the prebuilts reorg.

Change-Id: I6afa82d7ac64286aa89b4b1cfb4af59e4c7000ce
 2012-05-08 16:18:32 -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
Glenn Kasten
1f3899d418 am cceaf8d8: am ebd6016b: Merge "Add audio tag to systrace" into jb-dev 
* commit 'cceaf8d80d29879c3ce045b8bed92181aaee9d8e':
  Add audio tag to systrace
 2012-05-08 15:01:46 -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
Fabrice Di Meglio
be17aaae33 am 20dafa47: am d9aab543: Merge "Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions" into jb-dev 
* commit '20dafa47b62d1125575cd75b60eb2b17d43c0f06':
  Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions
 2012-05-08 11:33:49 -07:00
Victoria Lease
eb214f2fb5 am 6f88f764: am 7ca37df0: Merge "Add Droid Devanagari/Tamil fonts." into jb-dev 
* commit '6f88f7647d798bc4fff3988d6327df2ee7476573':
  Add Droid Devanagari/Tamil fonts.
 2012-05-08 11:33:45 -07:00
Jim Miller
6dfe7d937f am 07e1f123: am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit '07e1f12350819cc8fa93dbfe9e8655594b859e64':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-08 11:33:38 -07:00
Matthew Xie
88dcbda03b am 87d7c1d7: am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit '87d7c1d740c93147a762595fd7e415dbebfb182f':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-08 11:33:35 -07:00
Jim Miller
56f895a2fc am 8676726d: am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '8676726dcfa54e4fecb0c0676d9945ad49f079c5':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-08 11:33:22 -07:00
Jeff Sharkey
54cb5592b6 am 83abfb3c: am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev 
* commit '83abfb3cab53314fd5a7601e427b4b8b714f6f06':
  Handle silent ringtone, title without permission.
 2012-05-08 11:32:45 -07:00
Robert Greenwalt
1fee5ef1aa am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit 'd760beb735538d61d78584722352a888629b670a':
  Bring up the ethernet interface when detected
 2012-05-08 11:32:41 -07:00
Eric Fischer
7216d98e8f am 3b08f16d: (-s ours) am 7833e5f5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '3b08f16da271fb0107c6cb844e4acbcd75d8a9b1':
  Import translations. DO NOT MERGE
 2012-05-08 11:32:36 -07:00
Eric Fischer
019fab41f7 am 26c2c601: (-s ours) am 0253c059: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '26c2c6010b9ef1b834b218e49a9641c5d88f9de9':
  Import translations. DO NOT MERGE
 2012-05-08 11:32:30 -07:00
Chet Haase
92fe0fabf3 am 48fa4717: am 4bbcae7e: Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev 
* commit '48fa47174268a7e94e3e39fdd02785d97be3d446':
  Fix issue where scale-animating text would jump temporarily a few pixels
 2012-05-08 11:32:25 -07:00
Craig Mautner
f3a7cb3cac am 22135e46: am d8efe424: Merge "Change DimAnimator to reflect rotations." into jb-dev 
* commit '22135e46b167ed45337ba41bd306d93e5fa67841':
  Change DimAnimator to reflect rotations.
 2012-05-08 11:32:15 -07:00
Marco Nelissen
630f6243da am 7bd44d97: am b3482ffb: Merge "Fix crash when decoding bitmap" into jb-dev 
* commit '7bd44d97f7026d3d4e8d2c2e1d14d96bf936f2a6':
  Fix crash when decoding bitmap
 2012-05-08 11:32:09 -07:00
Philip Milne
3ed259a43c am 2a52d26c: am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '2a52d26c0b917de8b1e4d20ebad87b9b3825f6ca':
  Hide optical bounds feature for JB.
 2012-05-08 11:32:06 -07:00
Amith Yamasani
988b832b34 am 503b2e5a: am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '503b2e5ae1b83e5595b47a8d376db6b89b059b87':
  Javadoc improvements in SearchView per API review.
 2012-05-08 11:29:57 -07:00
John Reck
2eeec7189e am 462ee95f: am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit '462ee95ff0cfb01d295c0b7e34bf995a50edb313':
  Remove heldMotionless disabling native scroll mode
 2012-05-08 11:29:54 -07:00
Gilles Debunne
bb5971a78f am 8779c022: am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '8779c022b401b2a269e058c2c27b885694b696f3':
  Final fix in SpannableStringBuilder.
 2012-05-08 11:29:49 -07:00
Jeff Sharkey
34ea7d84ec am e4b703b7: am fb0caad4: Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev 
* commit 'e4b703b7ea15ec9af2caec65a62ba6091bb61f0c':
  Ack, wrap advisePersistThreshold() in lock.
 2012-05-08 11:29:41 -07:00
Dianne Hackborn
eef6121618 am 8e11051a: Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev 
* commit '8e11051a06b3362b7d7cda654f8dcb5ca3760494':
  Tweak anim API to automatically call Intent.setSourceBounds().
 2012-05-07 16:15:25 -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
Glenn Kasten
cceaf8d80d am ebd6016b: Merge "Add audio tag to systrace" into jb-dev 
* commit 'ebd6016b8c6faf70b44283c59461023cda1ca6b0':
  Add audio tag to systrace
 2012-05-07 15:48:43 -07:00
Glenn Kasten
ebd6016b8c Merge "Add audio tag to systrace" into jb-dev 2012-05-07 15:45:03 -07:00
Dianne Hackborn
009e6e6b5e am bae365c1: Merge "Fix issue #6319312: Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev 
* commit 'bae365c166538d5c2319bf42aaf1715a1fb749e7':
  Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()...
 2012-05-07 15:14:50 -07:00
Dianne Hackborn
bae365c166 Merge "Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()..." into jb-dev 2012-05-07 15:12:33 -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
Fabrice Di Meglio
20dafa47b6 am d9aab543: Merge "Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions" into jb-dev 
* commit 'd9aab5432e48211b1b89410ec290db5d9c511bf3':
  Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions
 2012-05-07 14:54:23 -07:00
Victoria Lease
6f88f7647d am 7ca37df0: Merge "Add Droid Devanagari/Tamil fonts." into jb-dev 
* commit '7ca37df0e4832dfa06f46850b0ddc80db4bc66dc':
  Add Droid Devanagari/Tamil fonts.
 2012-05-07 14:54:21 -07:00
Fabrice Di Meglio
d9aab5432e Merge "Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions" into jb-dev 2012-05-07 14:51:24 -07:00
Jim Miller
07e1f12350 am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 
* commit 'a482f942dae90211540c856664ca71ba29297309':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
 2012-05-07 14:51:19 -07:00
Victoria Lease
7ca37df0e4 Merge "Add Droid Devanagari/Tamil fonts." into jb-dev 2012-05-07 14:51:16 -07:00
Jim Miller
a482f942da Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 2012-05-07 14:48:19 -07:00
Fabrice Di Meglio
6162876067 Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions 
- take care of ttf filename changes and regular/bold versions

Change-Id: Ib71d2537df16ff954cef9619c12d611948d19efe
 2012-05-07 14:42:56 -07:00
Matthew Xie
87d7c1d740 am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit 'ac8a61b6d47e737794b2aaeaf629d87e493413b8':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-07 14:41:41 -07:00
Jim Miller
72b26c1fa2 Fix 6397736: Fix issue with MultiWaveView in incoming call screen. 
This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd
 2012-05-07 14:39:31 -07:00
Matthew Xie
ac8a61b6d4 Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 2012-05-07 14:38:42 -07:00
Jim Miller
8676726dcf am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 
* commit '06e8d6647db54aa76dda92a5a785737e66d262de':
  Fix 6397736: Swipe up to search layout fixes
 2012-05-07 14:37:39 -07:00
Jim Miller
06e8d6647d Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 2012-05-07 14:34:00 -07:00
Jeff Sharkey
83abfb3cab am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev 
* commit '476b03b0c0d5cae4d1b114c6f80858d59ba36cad':
  Handle silent ringtone, title without permission.
 2012-05-07 13:46:24 -07:00
Jeff Sharkey
476b03b0c0 Merge "Handle silent ringtone, title without permission." into jb-dev 2012-05-07 13:43:04 -07:00
Robert Greenwalt
d760beb735 am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit '2321301fe75f945b002372d6d35c597191564452':
  Bring up the ethernet interface when detected
 2012-05-07 13:42:53 -07:00
Robert Greenwalt
2321301fe7 Merge "Bring up the ethernet interface when detected" into jb-dev 2012-05-07 13:39:34 -07:00
Eric Fischer
3b08f16da2 am 7833e5f5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7833e5f53228dd3f34c0f41550fea8564ed3222a':
  Import translations. DO NOT MERGE
 2012-05-07 13:30:19 -07:00
Jeff Sharkey
1d8e5c5880 Handle silent ringtone, title without permission. 
Silent ringtones have a valid Uri, but isn't openable by MediaPlayer,
so treat as no-op playback instead of throwing.  Also handle missing
permissions when resolving title.

Bug: 6448074, 6447538
Change-Id: I656675d7fc2e78a6ba05824e13bdd43193fcfdf2
 2012-05-07 13:30:10 -07:00
Eric Fischer
26c2c6010b am 0253c059: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '0253c05962027607e38d7f9c49be1174edf892c9':
  Import translations. DO NOT MERGE
 2012-05-07 13:26:49 -07:00
Eric Fischer
9e10a7ce2e Merge "Import translations. DO NOT MERGE" 2012-05-07 13:26:22 -07:00
Eric Fischer
7833e5f532 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-07 13:26:12 -07:00