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

73987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
e07694b24f Validate context when using RS objects. 
BUG=6035422

Change-Id: I8586be0085b36767289e1f634111c0ff076cec3c
 2012-04-03 15:36:36 -07:00
Andreas Huber
991c8733c3 Merge "More DRM/crypto support." 2012-04-03 14:27:35 -07:00
Andreas Huber
0e97fc248e More DRM/crypto support. 
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
 2012-04-03 14:16:07 -07:00
Scott Main
b52d99e188 am 8167faa0: am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '8167faa029485acc3245991d492ef951eb655399':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:07:08 -07:00
Scott Main
8167faa029 am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '2449b2eb84f75e0bee366f9646d0863daa966b83':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:03:32 -07:00
Daisuke Miyakawa
fd007cb576 Merge "Shorten PRESSED_STATE_DURATION" 2012-04-03 14:00:58 -07:00
Scott Main
2449b2eb84 am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:00:17 -07:00
Scott Main
0687c83032 Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 2012-04-03 13:58:16 -07:00
Russell Brenner
dedf1b2727 Merge "Add Japanese to fallback fonts" 2012-04-03 13:33:22 -07:00
Fred Chung
60e2487a6e am ce151065: am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit 'ce15106585b4d347cedca0b9a8f4b06fc58fcb0b':
 2012-04-03 13:27:12 -07:00
Scott Main
7970558e75 docs: change markup for "new" tags to avoid the new tags wraping solo 
Change-Id: If88d3cc173080db101ea5af9dc728653a2176a46
 2012-04-03 13:25:47 -07:00
Fred Chung
8ceaac0975 am 59616aa6: am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '59616aa6e652b8d54df93567101e3b455f2d94a8':
  Android Training: Making Your App Location Aware
 2012-04-03 13:24:15 -07:00
Fred Chung
ce15106585 am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '0249e6c4f9083206c1ab280dfa149a65bf931b7e':
 2012-04-03 13:23:29 -07:00
Fred Chung
59616aa6e6 am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '274fb3c68077fcf710f8f9c165681265af4ffcd7':
  Android Training: Making Your App Location Aware
 2012-04-03 13:21:15 -07:00
Fred Chung
0249e6c4f9 am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware
 2012-04-03 13:18:59 -07:00
Fred Chung
274fb3c680 am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware
 2012-04-03 13:18:16 -07:00
Fred Chung
04a73fb65c Merge "Android Training: Making Your App Location Aware" into ics-mr1 2012-04-03 13:16:42 -07:00
Michael Kolb
73975e06e3 Merge "Remove embedded titlebar rendering" 2012-04-03 13:02:28 -07:00
Daisuke Miyakawa
c19895f7ed Shorten PRESSED_STATE_DURATION 
Bug: 6259150
Change-Id: Ic8b28295a7e97ca2885d074962f73d5f1bf980c6
 2012-04-03 12:25:26 -07:00
Mike Lockwood
2cee762836 Merge "Merge remote-tracking branch 'goog/ics-aah'" 2012-04-03 12:13:30 -07:00
Mike Lockwood
6fa05e8b37 Merge "Merge commit '7f71d01'" 2012-04-03 12:13:15 -07:00
Mike Lockwood
62b21c69ca Merge "Merge commit 'bc52ca2'" 2012-04-03 12:12:58 -07:00
Mike Lockwood
f0f1955c17 Merge "Merge commit '830ad08'" 2012-04-03 12:12:45 -07:00
Mike Lockwood
595e8a5fbc Merge "Merge commit '830ad08^'" 2012-04-03 12:12:35 -07:00
Mike Lockwood
c1d0643982 Merge remote-tracking branch 'goog/ics-aah' 2012-04-03 11:54:31 -07:00
Mike Lockwood
b5f2088c8e Merge commit '7f71d01' 2012-04-03 11:54:11 -07:00
Mike Lockwood
69ccdbd78a Merge commit 'bc52ca2' 
Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da
 2012-04-03 11:53:47 -07:00
Mike Lockwood
3e29718d34 Merge commit '830ad08' 2012-04-03 11:50:08 -07:00
Mike Lockwood
e75e812682 Merge commit '830ad08^' 2012-04-03 11:49:56 -07:00
Svetoslav Ganov
1663565739 Merge "Polish the Number/Date/Pickers per UX request." 2012-04-03 11:38:47 -07:00
Jeff Sharkey
7e84830442 Merge "Let ViewStub be used in RemoteViews." 2012-04-03 11:25:24 -07:00
Fred Chung
e2483a240e Android Training: Making Your App Location Aware 
Change-Id: I7091f1fd10707c0397fe0d8bc066d38dcd5174ec
 2012-04-03 11:09:43 -07:00
Joe Fernandez
b3fa3960a0 am bf7216ac: am 2095427d: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit 'bf7216acf5402516e2a07e1d69f2631baa546a88':
 2012-04-03 10:17:44 -07:00
Alexander Lucas
b525ac6fd1 am 49edf0db: am c31f6b96: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '49edf0db00c860303ff09952fdaa2e21f881b114':
 2012-04-03 10:14:46 -07:00
Joe Fernandez
bf7216acf5 am 2095427d: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit '2095427d1b81284d4ffff3de768122d08c2309fe':
 2012-04-03 10:13:38 -07:00
Joe Fernandez
110414928a am c1a0e54d: am b459b619: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit 'c1a0e54de12aee41163b84a25ea8dfc8b64304dc':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
 2012-04-03 10:11:59 -07:00
Alexander Lucas
234a369b8d am 02a309f8: am 7c8d5574: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '02a309f8d39649404426683e186fa52638986937':
  initial accessibility class commit
 2012-04-03 10:11:56 -07:00
Alexander Lucas
49edf0db00 am c31f6b96: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit 'c31f6b96bd8e9d91085e862313f63a73c356516e':
 2012-04-03 10:09:47 -07:00
Joe Fernandez
c1a0e54de1 am b459b619: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit 'b459b619b389f999564c3c526fe703e0c966ed9b':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
 2012-04-03 10:08:09 -07:00
Alexander Lucas
02a309f8d3 am 7c8d5574: am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '7c8d55747a408d5d0594ce0198817e4dadf10ae0':
  initial accessibility class commit
 2012-04-03 10:08:07 -07:00
Joe Fernandez
2095427d1b am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
 2012-04-03 10:07:29 -07:00
Joe Fernandez
ade335016e am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
 2012-04-03 10:05:17 -07:00
Alexander Lucas
31e1e27107 am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit
 2012-04-03 10:05:15 -07:00
Joe Fernandez
b459b619b3 am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 
* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
 2012-04-03 10:04:54 -07:00
Alexander Lucas
7c8d55747a am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit
 2012-04-03 10:04:52 -07:00
Alexander Lucas
c31f6b96bd am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1 
* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit
 2012-04-03 10:04:41 -07:00
Joe Fernandez
945b7cb324 Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 2012-04-03 10:03:35 -07:00
Alexander Lucas
95dc3b50fc Merge "initial accessibility class commit" into ics-mr1 2012-04-03 10:02:48 -07:00
Russell Brenner
1c097a9c21 Add Japanese to fallback fonts 
On devices with adequate space, add MTLmr3m.ttf (Japanese) to the set
of fallback fonts. By default, DroidSansFallback (Chinese) is given
priority over MTLmr3m. If the locale is changed to Japanese, the
priority is reversed.

Bug: 6272763
Change-Id: I785a927d6dff0206aa9a670c51fdad76e219fc97
 2012-04-03 10:01:16 -07:00
Amith Yamasani
15001eafa2 Merge "Dump the uid of a notification, for debugging." 2012-04-03 09:59:55 -07:00