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

38374 Commits

Author SHA1 Message Date
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
Baligh Uddin
91ec43b699 Merge "Import translations. DO NOT MERGE" 2012-11-15 08:09:03 -08:00
Baligh Uddin
aaf3fbc665 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:03:08 -08:00
Baligh Uddin
9d6cf4e1c3 am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'f118bcc5b276f54af9b9f2248867a7eff5bc92ad':
  Import translations. DO NOT MERGE
 2012-11-15 08:01:34 -08:00
Baligh Uddin
f118bcc5b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-15 07:59:36 -08:00
Björn Lundén
1129a85203 Framework: Use holo alert drawables 
Replaces the current usage of the GB alert
drawable with theme-consistent holo ones.

Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
 2012-11-15 15:32:02 +01:00
Daniel Sandler
1812b34503 am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '2bb5dc6a367ce869939728b2978be7ca61a4b8b8':
  Notification vibration improvements:
 2012-11-15 06:17:31 -08:00
Daniel Sandler
2bb5dc6a36 am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '83b2596155ec1845194c08bd27a6e8dfbeb530b9':
  Notification vibration improvements:
 2012-11-15 06:13:46 -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
Fabrice Di Meglio
bb0cbae441 Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode 
- keep the Error Drawable infos into the Drawables cache
- reset left/right Drawable state before resolving where to put the Error Drawable
- get the mirrored Drawable for the Error popup background
- set the Error popup position depending on the layout direction (so that the "triangle"
of the background is pointing to the middle of the Error icon)

One restriction: we load the Error popup background Drawable corresponding to the layout
direction of the System Locale. So if you set the Layout direction on a TextView (or
an EditText) to RTL and set an error to it when you are in a RTL System Locale, then you
see that the background "triangle" is not pointing to the Error icon. This is working as
intended as the AssetManager load the Drawable resource depending on the configuration
which is in that case the RTL one thus loading the RTL version of the background (and not
the LTR one).

Thus there can be a discrepancy between the "layout direction" of the TextView
and the one from the Error popup background. This would happen only thru using the SDK and
not in a normal case when running an App.

Change-Id: I91bbfbe46ac20efe0e585c5d4c766db23b5c709d
 2012-11-14 16:41:24 -08:00
Glenn Kasten
d202ef9380 Merge "Use uint32_t for sample rate" 2012-11-14 16:31:02 -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
Glenn Kasten
85fbc871de Use uint32_t for sample rate 
Change-Id: If6d4f53254b630dc479af22b77b59555b43eeab4
 2012-11-14 13:47:46 -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
Daniel Sandler
edbb380950 Notification vibration improvements: 
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use a different
   vibration pattern.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
 2012-11-14 11:50:11 -08:00
Baligh Uddin
844c93f23d Import translations. DO NOT MERGE 
Change-Id: Idf68966ea14c7d45264402b737c2aefc562bdb5a
Auto-generated-cl: translation import
 2012-11-14 10:23:52 -08:00
Baligh Uddin
0a26a6ca82 Import translations. DO NOT MERGE 
Change-Id: I13afa2f030ae612ee052a52180bfd00d2f49b1e7
Auto-generated-cl: translation import
 2012-11-14 10:13:51 -08:00
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE 
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
 2012-11-14 10:11:28 -08:00
Baligh Uddin
9e5475ff4c Import translations. DO NOT MERGE 
Change-Id: I9ad763b503ee41237e4ff5de0b19055e22c75acf
Auto-generated-cl: translation import
 2012-11-14 10:09:02 -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
Michael Jurka
7f1c0219fe am 75386446: am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit '75386446388ce3e91a7d96d6ebcef79c90e663f1':
  Add xxhdpi version of default activity icon
 2012-11-13 11:19:27 -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
Michael Jurka
7538644638 am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit '81b74a61d76ac97cdcf89a6548b962d41093b0d6':
  Add xxhdpi version of default activity icon
 2012-11-13 10:47:09 -08:00
Marco Nelissen
cccef471cc Merge "Make VideoView/MediaController behave better" 2012-11-13 10:45:46 -08:00
Michael Jurka
81b74a61d7 am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit 'c1d5db796385e011b253b8f260d6e96a2c922f59':
  Add xxhdpi version of default activity icon
 2012-11-13 10:41:36 -08:00
Michael Jurka
c1d5db7963 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 2012-11-13 10:36:26 -08:00
Martin Kosiba
15cb825493 Update WebViewClient.shouldInterceptRequest JavaDoc. 
This changes the wording to say 'not UI thread' instead of 'network
thread'.

Change-Id: I9bc94830297b88639e7749392e3c2082b087f4ce
 2012-11-13 18:25:48 +00:00
Martin Kosiba
881c49c99b Update WebViewClient.shouldOverrideUrlLoading JavaDoc. 
Add a comment to say that the method will not be called for POST requests.

Change-Id: If767093846584df834f9d258241306722b1abd99
 2012-11-13 18:25:23 +00:00