Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,331 Commits 3 Branches 0 Tags
b920b40510cd237b9dd60a00717527cd4ece2247
Commit Graph

29616 Commits

Author SHA1 Message Date
Fabrice Di Meglio
b920b40510 am e784ae8e: am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'e784ae8e6a0eab3d29afc9b19f65714e7b268b97':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 15:17:30 -08:00
Fabrice Di Meglio
e784ae8e6a am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'd689e8c3a05f3b200d19879bdc169e6ad6e0436b':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 15:14:02 -08:00
Fabrice Di Meglio
d689e8c3a0 am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'b0f895b330d0d2b6725e7deee158ff20ed9155f8':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 14:31:02 -08:00
Fabrice Di Meglio
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00
Michael Jurka
3a22636222 am 3366a5d5: am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '3366a5d54eccbbe861bcc765653664d80eae5398':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:37:08 -08:00
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Robert Greenwalt
60bfacd8ef Merge "Support for dns domain." 2012-11-16 12:56:56 -08:00
Robert Greenwalt
8058f62189 Support for dns domain. 
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
 2012-11-16 11:25:32 -08:00
Fabrice Di Meglio
cf0a5865f4 am e054ab85: am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit 'e054ab85388d71c8b1d46fa4e67018ff2aaa97ae':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-16 10:38:08 -08:00
Jeff Sharkey
8e2ffc76a9 am 9634e970: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit '9634e970679c687572e2da84250adc8baf91a8c3':
  Useful annotations for code documentation.
 2012-11-16 10:37:59 -08:00
Jeff Sharkey
6dd028cbb9 am 9f43afad: am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '9f43afad9de92fc36dc7b242585ef734e834285c':
  Utility to format human-friendly durations.
 2012-11-16 10:37:54 -08:00
Jeff Sharkey
2654442b5b am 9077ca58: am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit '9077ca586e083fd0e2913c4232915416b3719e7d':
  Watch for leaked ParcelFileDescriptors.
 2012-11-16 10:37:46 -08:00
Przemyslaw Szczepaniak
c3c427d2e3 Revert "Make TTS input string limit public and documented" 
This reverts commit f288a64f5b

Change-Id: I6f3e2a6a6a131b0422cfcdb2bda23f8ae245d774
 2012-11-16 05:11:23 -08:00
Przemyslaw Szczepaniak
f288a64f5b Make TTS input string limit public and documented 
Bug: 7456118
Change-Id: Iced44eb349e1abb551f991c2b9357a03bab3bb3d
 2012-11-16 03:14:22 -08:00
Fabrice Di Meglio
e054ab8538 am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '348cf60dbb1de980aa97e551817765e7b3fa0221':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:27:03 -08:00
Fabrice Di Meglio
348cf60dbb am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '674a131cb625a7aae0c6e50a24a968200c71b566':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:23:53 -08:00
Fabrice Di Meglio
674a131cb6 Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 2012-11-15 12:21:00 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
9f43afad9d am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '68363456c1f360c0f1afe637a1f3028519e059ed':
  Utility to format human-friendly durations.
 2012-11-15 11:54:43 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
9077ca586e am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit 'dcb72dbb39227674e4a54167efabcdc8add4548a':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:51:49 -08:00
Jeff Sharkey
68363456c1 am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '7420ab681eaad22f4b8f884e12d3b2ce82cd203a':
  Utility to format human-friendly durations.
 2012-11-15 11:51:38 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
dcb72dbb39 am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit '445767c14ceb51d2839a7bc818c68c81ee7d80a7':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:47:43 -08:00
Jeff Sharkey
7420ab681e Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 2012-11-15 11:47:36 -08:00
Jeff Sharkey
445767c14c Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 2012-11-15 11:45:23 -08:00
Martin Kosiba
59f46b5b90 Merge "Update WebViewClient.shouldInterceptRequest JavaDoc." 2012-11-15 10:50:13 -08:00
Martin Kosiba
ad57766a1c Merge "Update WebViewClient.shouldOverrideUrlLoading JavaDoc." 2012-11-15 10:46:39 -08:00
Fabrice Di Meglio
8701bb90db Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR 
- change heuristic to LTR.

Change-Id: I3c5f413e48ceddbd931d713eb8c168431fcd09a2
 2012-11-14 19:57:11 -08:00
Fabrice Di Meglio
7d529cd6eb Fix Javadoc for View layoutDirection / textDirection / textAlignment 
Change-Id: I2fa2f02bd2f59ee93ccd56fc6bd28b93e4713cc4
 2012-11-14 18:09:30 -08:00
Kenny Root
54645557cb resolved conflicts for merge of 09de4dad to master 
Change-Id: I4fb41ff1c68f9c6ce38cee9e9fcd11ef7f0f357d
 2012-11-14 15:33:18 -08:00
Kenny Root
09de4dad57 am e4163e96: Merge "Switch keystore to binder" 
* commit 'e4163e96e0ee31c6e78434114cc1dcf4cd3ab5bd':
  Switch keystore to binder
 2012-11-14 15:25:57 -08:00
Maurice Chu
77c2655adb Add method name to curl output 
Backporting change made to AndroidHttpClient.java from
CL I0f3819e84542023fca65ec4a29534ef32e877570.

Bug: 7499444
Change-Id: Ie67d2917fa378afb00ec4bd7c3de238f48f7c6af
 2012-11-14 11:55:33 -08:00
Kenny Root
6b77645aa9 Switch keystore to binder 
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
 2012-11-14 08:45:52 -08:00
Jeff Sharkey
53f6e8a9b9 Utility to format human-friendly durations. 
Bug: 6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
 2012-11-13 17:26:39 -08:00
Joe Malin
74e6489d89 am 9ae6845a: am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '9ae6845ae866c3f1563d3ba8ee0fe43e0135bbf8':
  Notification.java javadoc: addAction
 2012-11-13 14:33:18 -08:00
Joe Malin
9ae6845ae8 am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '27b587b6867768860c2e3f13567ba3d312d9b952':
  Notification.java javadoc: addAction
 2012-11-13 14:30:51 -08:00
Joe Malin
27b587b686 am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit 'faa38a08d5998e32dcfe21e084076cbbb64ca0ea':
  Notification.java javadoc: addAction
 2012-11-13 14:28:40 -08:00
Joe Malin
faa38a08d5 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
  Notification.java javadoc: addAction
 2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
 2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
 2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
 2012-11-13 14:20:54 -08:00
Fabrice Di Meglio
7a12433390 am bb67d486: am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit 'bb67d48606afdeb34fc488fb16f18c136eb49ec8':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:24:49 -08:00
Fabrice Di Meglio
bb67d48606 am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit 'a97f5b8c2585c87e1b82e5ce3b7aab149668a711':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:07:30 -08:00
Fabrice Di Meglio
a97f5b8c25 am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit '9d82d324de7d544c95458faa05a87014e53e8892':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:05:58 -08:00
Fabrice Di Meglio
9d82d324de Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 2012-11-13 11:03:19 -08:00
Marco Nelissen
c1374e8e1a Fix build 
Restore unused-but-public "resolveAdjustedSize" method.

Change-Id: I2f2bdbf96c484bcd457790fde970f1c67296b857
 2012-11-13 10:54:51 -08:00
Marco Nelissen
cccef471cc Merge "Make VideoView/MediaController behave better" 2012-11-13 10:45:46 -08:00