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

69186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
23b39217a5 am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit 'ce8697f8d5368aa617b853fdabb6d7fb980bc5ce':
 2012-03-06 14:54:19 -08:00
Android Git Automerger
30e9f8807e Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-06 14:54:13 -08:00
Roman Nurik
f4d8fa6090 am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit 'c4b44be63d0dd315ddc499c3e939af0f4b5de594':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:45:19 -08:00
Roman Nurik
ce8697f8d5 am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:43:38 -08:00
Roman Nurik
c4b44be63d am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:42:59 -08:00
Roman Nurik
96c757e557 Merge "docs: move Android Design from static HTML to JD" into ics-mr1 2012-03-06 14:39:54 -08:00
Scott Main
30f954dd2d am bf03ee12: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit 'bf03ee12dba1504f8733297158a412b3eab40deb':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:28:44 -08:00
Scott Main
842b4e22e3 am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit 'fff19ee88baff16e144d1bfc23c25a4b7f2cb191':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:28:37 -08:00
Scott Main
fff19ee88b am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:25:27 -08:00
Scott Main
bf03ee12db am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:24:55 -08:00
Scott Main
66895ad5f7 Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 2012-03-06 14:23:23 -08:00
Nicolas Roard
b4827c089f Merge "Pass the version down to native" 2012-03-06 14:13:54 -08:00
Scott Main
3f6912e5e8 am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings 
* commit 'f3cbcf439692b180ec5081cc68ed67c8f2a9d16d':
 2012-03-06 14:01:48 -08:00
Scott Main
15b7481d34 am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings 
* commit '40dbc3db62006f81656043e174e9019c89686e9b':
  docs: a few more Market -> Play strings
 2012-03-06 13:59:34 -08:00
Scott Main
f3cbcf4396 am 97b94e78: docs: a few more Market -> Play strings 
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
 2012-03-06 13:58:04 -08:00
Scott Main
40dbc3db62 am 97b94e78: docs: a few more Market -> Play strings 
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
 2012-03-06 13:57:32 -08:00
Gilles Debunne
957c800ac0 Merge "Ellipsize avoids spaces and starts right after text" 2012-03-06 13:57:16 -08:00
Glenn Kasten
dbaf2cc1bf Merge "Rename updateWaitTime since a lock is held" 2012-03-06 13:44:56 -08:00
Glenn Kasten
2bad67f3e3 Rename updateWaitTime since a lock is held 
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
 2012-03-06 12:46:21 -08:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD 
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
 2012-03-06 12:26:15 -08:00
Glenn Kasten
26bbc5c0d3 Fix indentation for re-organized code 
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
 2012-03-06 12:14:54 -08:00
Scott Main
97b94e784c docs: a few more Market -> Play strings 
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
 2012-03-06 12:10:17 -08:00
Adam Powell
75d022af1f Action buttons are now 1 view instead of 3. 
Change-Id: I42afe0e4bd20c3dbe86e2c43a6bc1d776361dca9
 2012-03-06 12:06:15 -08:00
Nicolas Roard
18e9886342 Pass the version down to native 
Change-Id: Ie240ea9875862288cf09fcfa1113b8e6cb3a7b1d
 2012-03-06 11:53:56 -08:00
Fabrice Di Meglio
42b40c0ed8 Merge "Fix bug #4972463 Update CTS tests for TextView textDirection" 2012-03-06 11:48:14 -08:00
Scott Main
19fa8fee25 Fix badge generator URLs and images, and update 
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.

Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
 2012-03-06 11:46:30 -08:00
Glenn Kasten
9a42ac982e Rename fields of AudioSessionRef 
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
 2012-03-06 11:43:55 -08:00
Robert Greenwalt
06402e91e9 Merge "Make NDC not block forever and handle restart." 2012-03-06 11:30:28 -08:00
Craig Mautner
135fb111df Merge "Fix deadlock by making DropBoxManager call async." 2012-03-06 11:12:40 -08:00
Eric Laurent
d1f0023ddf Merge "MediaPlayerService: fix AudioSink latency" 2012-03-06 10:53:39 -08:00
Eric Laurent
54682583ba Merge "AudioTrack: relax check on minimum buffer size" 2012-03-06 10:52:18 -08:00
Dianne Hackborn
4f03d35f9c Merge "Fix issues #6103378 and #5959515." 2012-03-06 10:34:18 -08:00
James Dong
b7fdddab0d Merge "Remove unused code - MediaSourceSplitter" 2012-03-06 10:23:58 -08:00
James Dong
bc6b837a60 Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object." 2012-03-06 10:23:51 -08:00
Dirk Dougherty
20d28a8265 am 2ef5d3fd: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '2ef5d3fd2e4114a141676dad94f9b0352392290a':
 2012-03-06 09:43:18 -08:00
Dirk Dougherty
fad7db430c am 106cdc6a: am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '106cdc6aba5af0d544da3042e2e8d2f8b6b1ead1':
  Update build-a-button to use new assets.
 2012-03-06 09:40:46 -08:00
Dirk Dougherty
2ef5d3fd2e am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
  Update build-a-button to use new assets.
 2012-03-06 09:39:02 -08:00
Dirk Dougherty
106cdc6aba am 9ad3d0ee: Update build-a-button to use new assets. 
* commit '9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
  Update build-a-button to use new assets.
 2012-03-06 09:38:31 -08:00
Craig Mautner
26caf7adf6 Fix deadlock by making DropBoxManager call async. 
Created a Handler and used it to make sendBroadcast call asynchronously.
Deadlock was caused by WindowManagerService Log.wtf call requiring
ActivityManagerService lock while holding its own lock. At the same time
ActivityManagerService was holding its lock while waiting for
WindowManagerService lock.

Tested by forcing a Log.wtf in
WindowManagerServices.updateWindowsAppsAndRotationAnimationsLocked
inside mAppTokens loop. Then ran 'adb shell monkey -v -v 500000'.
Without this fix it would lock up and reboot within a couple of minutes.
With this fix it runs until the Camera app crashes. But that's a
different bug...

Fixes bug 6112676.

Change-Id: I5b360aa08412d117b1765f01bacd931020509db7
 2012-03-06 09:30:18 -08:00
Dirk Dougherty
9ad3d0ee5b Update build-a-button to use new assets. 
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
 2012-03-06 09:28:17 -08:00
Siva Velusamy
aa52141212 Merge "gltrace: Send vertex attribute data after glDraw() call." 2012-03-06 08:59:32 -08:00
Alex Sakhartchouk
6a1d388282 Merge "First draft of the sample function implementation." 2012-03-06 08:31:54 -08:00
Glenn Kasten
66199cf939 Merge "Remove obsolete references to sched_policy.h" 2012-03-06 08:17:43 -08:00
Glenn Kasten
46c92df26d Merge "Remove references to sched_policy.h" 2012-03-06 08:17:20 -08:00
James Dong
a00c2939c7 Changed 480p and 1080p resolution documentation 
o related-to-bug: 6041794

Change-Id: I01c52ec68c715c46c3ce9e778dbc6ac1f74685b6
 2012-03-06 07:45:13 -08:00
Derek Sollenberger
ffa09ece76 Add missing includes for threads.h 
The missing header was being transitively included through a
Skia header which is being removed.

Change-Id: I5a65bae076027951fe07d1e7eecd4732124fb0e4
 2012-03-06 10:11:27 -05:00
Derek Sollenberger
6d159451bb Merge "Add missing includes for Mutex.h" 2012-03-06 05:27:31 -08:00
Daniel Sandler
6768c11d60 Merge changes I8343449c,I4eaf69a1 
* changes:
  New slide-out mechanism.
  Newly reimplemented PhoneStatusBar, now with fewer windows.
 2012-03-06 05:18:10 -08:00
Pin Ting
5d37e4d7e7 am 21b45b62: am 25c66c3a: Merge "Fix document." into ics-mr1 
* commit '21b45b624f5b5f888d0bfa89da7ecb58a0398dbe':
 2012-03-06 01:21:27 -08:00
Android Git Automerger
3e22047d1c Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-06 01:21:24 -08:00