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

105318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
cf49808697 Import translations. DO NOT MERGE 
Change-Id: Ia0c52e6aef99399156b84920f185d03b55f746b1
Auto-generated-cl: translation import
 2013-04-22 08:45:25 -07:00
Michael Wright
323efd55d3 am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment" 
* commit '076e1f4c560df7db54755b006acbea9b6eba0b76':
  KeyEvent: update comment
 2013-04-20 22:48:08 -07:00
Michael Wright
076e1f4c56 am abc2763e: Merge "KeyEvent: update comment" 
* commit 'abc2763e4587c3326d160f25666e933cc6888884':
  KeyEvent: update comment
 2013-04-20 22:43:56 -07:00
Michael Wright
abc2763e45 Merge "KeyEvent: update comment" 2013-04-21 05:34:28 +00:00
Chet Haase
684634144b am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 
* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting
 2013-04-20 21:37:23 -07:00
Dirk Dougherty
f986ecf47e am 0b97c8cd: am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '0b97c8cd0ff41a9c122cb83a1b0b33bd150cb7ff':
  Doc change: updates for tablet checklist.
 2013-04-20 21:37:20 -07:00
Selim Gurun
e3c2e53b5e am bf67c6bb: am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'bf67c6bbd94f6401344777daa6ef795ddd560218':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 21:37:18 -07:00
Selim Gurun
e8cb9e55b8 am 20113c0b: am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '20113c0b4dc6f5d6bebaf3175bfc99ce89cc2388':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 21:37:15 -07:00
Geremy Condra
7f5886b90a am 0052e789: am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp 
* commit '0052e7899fe60c7231bb4ae200904e17fac8804c':
  Add a delimiter between scheme and host
 2013-04-20 21:37:12 -07:00
Stephen Hines
0f59d6d34e am 4a84af89: am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev 
* commit '4a84af896c830d6ef613d1baa607d472cf865073':
  Add new error code for Debug Context work.
 2013-04-20 21:37:10 -07:00
Jeff Brown
4a96970e55 am e2155712: am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev 
* commit 'e215571284006497cd917ade06cf2b9163564772':
  Revert all recent GLSurfaceView changes.
 2013-04-20 21:37:07 -07:00
Fabrice Di Meglio
16cea16570 am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev 
* commit 'b241f60fe76677d106d472d4118d1e6959563331':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text
 2013-04-20 21:37:04 -07:00
Kenny Root
9edfd5f2df am 0f70770b: am b5ec8c14: Change doc comment to match API change 
* commit '0f70770be83b02c36262ad7e05ac5b2040de3fec':
  Change doc comment to match API change
 2013-04-20 21:37:01 -07:00
Christopher Tate
114f85dcb7 am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev 
* commit '353bd75bbab5904cc872364586acf7eb05b4e264':
  Provide SharedPreferences coherence guarantees for BackupAgent
 2013-04-20 21:36:57 -07:00
Victoria Lease
a5d3459316 am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev 
* commit '7e170b632147da55f93864223419a9f7fa651410':
  do not attempt to parcel unknown ParcelableSpans
 2013-04-20 21:36:55 -07:00
Dianne Hackborn
4c2b007b5e am 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev 
* commit '5b00f5584a7894bb79f9ce369d88cea5d886ff22':
  Follow up on issue #8159072: Spinner widget should be RTL'ized
 2013-04-20 21:36:51 -07:00
Craig Mautner
65d67a98c0 am 70f30d21: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev 
* commit '70f30d217c49b12c209055230afec2ac412ae165':
 2013-04-20 21:36:49 -07:00
Chet Haase
371d4cccde am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 
* commit '339ac85483145972da010ad34cbcb29ed70cb822':
  Fix quickReject logic to account for setClipChildren() setting
 2013-04-20 21:34:59 -07:00
Dirk Dougherty
0b97c8cd0f am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '16f654c963890e0ed134560a20f2a481ae4fc7d9':
  Doc change: updates for tablet checklist.
 2013-04-20 21:34:55 -07:00
Selim Gurun
bf67c6bbd9 am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'b2d82bc0ab0f201443a768e6a8b1636da370c690':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 21:34:55 -07:00
Selim Gurun
20113c0b4d am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '940718d8598e4b8da3009b46e8edba9d1dc6ed40':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 21:34:55 -07:00
Geremy Condra
0052e7899f am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp 
* commit '5f49fd866105cd8d5e7355d40d1268f4cc121ef7':
  Add a delimiter between scheme and host
 2013-04-20 21:34:54 -07:00
Stephen Hines
4a84af896c am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev 
* commit 'b322f99476574546cad638ed8e2866ec106d51fc':
  Add new error code for Debug Context work.
 2013-04-20 21:34:54 -07:00
Jeff Brown
e215571284 am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev 
* commit 'a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
  Revert all recent GLSurfaceView changes.
 2013-04-20 21:34:53 -07:00
Fabrice Di Meglio
b241f60fe7 am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev 
* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text
 2013-04-20 21:34:53 -07:00
Kenny Root
0f70770be8 am b5ec8c14: Change doc comment to match API change 
* commit 'b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
  Change doc comment to match API change
 2013-04-20 21:34:52 -07:00
Christopher Tate
353bd75bba am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev 
* commit '18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
  Provide SharedPreferences coherence guarantees for BackupAgent
 2013-04-20 21:34:52 -07:00
Victoria Lease
7e170b6321 am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev 
* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
  do not attempt to parcel unknown ParcelableSpans
 2013-04-20 21:34:52 -07:00
Dianne Hackborn
5b00f5584a am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev 
* commit 'b3bffa8080c4b04285897d18f913cf6385b0e9e1':
  Follow up on issue #8159072: Spinner widget should be RTL'ized
 2013-04-20 21:34:51 -07:00
Craig Mautner
70f30d217c am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev 
* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
  Improve javadoc for rotationAnimation.
 2013-04-20 21:34:51 -07:00
Chet Haase
339ac85483 Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 2013-04-20 21:02:21 +00:00
Dirk Dougherty
16f654c963 am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit 'f4f5757b68e3b0db10c77ac9fa81d6b4d7dd8435':
  Doc change: updates for tablet checklist.
 2013-04-20 12:11:49 -07:00
Dirk Dougherty
f4f5757b68 am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '014513ae2974edd2e6102f618ca57423c543cb4f':
  Doc change: updates for tablet checklist.
 2013-04-20 12:09:42 -07:00
Dirk Dougherty
014513ae29 am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '00d20bd293e75beb546ea446901cdead39180116':
  Doc change: updates for tablet checklist.
 2013-04-20 12:08:04 -07:00
Dirk Dougherty
00d20bd293 am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit 'e0d5add782405fabe4d04b8eff00b565ea28a35f':
  Doc change: updates for tablet checklist.
 2013-04-20 12:05:45 -07:00
Dirk Dougherty
e0d5add782 am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '3fd1a8926ebfaaeccbaad86b7584fa534f725996':
  Doc change: updates for tablet checklist.
 2013-04-20 12:03:37 -07:00
Dirk Dougherty
3fd1a8926e am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
  Doc change: updates for tablet checklist.
 2013-04-20 12:01:29 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist. 
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
 2013-04-20 11:34:51 -07:00
Craig Mautner
3505a9c6c6 Merge "Use correct stacks for testing changes." 2013-04-20 17:38:59 +00:00
Craig Mautner
165640bbc6 Use correct stacks for testing changes. 
Fixes bug 8656057.

Change-Id: I88e48d28d240fced866a82bd3d49f8807300c0ad
 2013-04-20 10:37:58 -07:00
Selim Gurun
b2d82bc0ab am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '8695b1aff8b4ece642796ba7b2a5faa2b8a87d60':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:38:34 -07:00
Selim Gurun
940718d859 am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:38:31 -07:00
Selim Gurun
8695b1aff8 am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '5eebdb4aa81f9e00e5f175bbebfec76cbde5b38d':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:35:32 -07:00
Selim Gurun
a68545796d am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:35:29 -07:00
Selim Gurun
5eebdb4aa8 am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:32:27 -07:00
Selim Gurun
fa1f7d21e9 am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:32:24 -07:00
Selim Gurun
a46537270e am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '25e150a2dd60a624ceecd5a5743a622fed32ef90':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:28:40 -07:00
Selim Gurun
07c9c2912d am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'a2b0b35ed8f5c53866058f65ccf8c6e4aabef7af':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:28:37 -07:00
Selim Gurun
25e150a2dd am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'a6ca0a6b2662e06cefcdbb5eb763e79f9b798018':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:25:09 -07:00