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

37903 Commits

Author SHA1 Message Date
Daniel Sandler
c89da9e28a am 1812b345: am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '1812b3450389b37bc069061cc69cb20754816f62':
  Notification vibration improvements:
 2012-11-16 10:36:19 -08:00
Glenn Kasten
fd1e3dfde2 Use size_t for frame count 
Change-Id: Idd364443715a920ece2cc54acc95b395b6ed2c6c
 2012-11-15 14:55:43 -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
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
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
Kenny Root
6b77645aa9 Switch keystore to binder 
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
 2012-11-14 08:45:52 -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
Craig Mautner
0f32fdc3db am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '50acd73173e5ca68db0a4cc01e75a2faef86b2fb':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:07:29 -08:00
Craig Mautner
50acd73173 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:04:27 -08:00
Craig Mautner
67a3fb6f3b am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit 'c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:02:21 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Baligh Uddin
d49e9c30ab Merge "Import translations. DO NOT MERGE" 2012-11-13 09:00:46 -08:00
Baligh Uddin
9885af0558 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
  Import translations. DO NOT MERGE
 2012-11-13 08:53:29 -08:00
Marco Nelissen
0b2d87237e Make VideoView/MediaController behave better 
Make VideoView support wrap_content size, and position the MediaController
inside of the anchor view instead of below it and centered on the screen.
b/6179034

Change-Id: Iec0dd9a1d953f742bbf7b12065946743a03745e5
 2012-11-13 07:55:20 -08:00
Baligh Uddin
5dabdb78c9 am bda180a6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'bda180a6d58a6e87c596d18b9a145e0120976f99':
  Import translations. DO NOT MERGE
 2012-11-12 16:27:36 -08:00
Baligh Uddin
bda180a6d5 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-12 16:25:24 -08:00
Fabrice Di Meglio
5acc379c54 Fix bug #7457897 Error icons are not shown in credit card entry form 
- fix regression: the error icon was no more showing is the widget was not focused

Change-Id: I24cc00a0cb79d38e365d413f9820b5a6981de4f4
 2012-11-12 14:31:19 -08:00
Michael Jurka
dac181319a Add xxhdpi version of default activity icon 
Bug: 7400295
 2012-11-12 14:12:46 -08:00
Justin Koh
14b46b1583 am 674db142: am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev 
* commit '674db142c56f01e581f7df4f3013e22f0922b21f':
  Make tap events less sensitive.
 2012-11-12 10:26:29 -08:00
Justin Koh
674db142c5 am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev 
* commit '446432692a2a7e60c7f547d6c7436922eb571d8e':
  Make tap events less sensitive.
 2012-11-12 10:24:21 -08:00
Justin Koh
446432692a Merge "Make tap events less sensitive." into jb-mr1-aah-dev 2012-11-12 10:20:43 -08:00
Ben Pietrzak
ffb5bdef63 Make tap events less sensitive. 
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
 2012-11-12 10:11:52 -08:00
John Spurlock
b80bc6737f am 4299f63e: am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit '4299f63e54dceeaaa44a057ba03f0881834491ec':
  Disable navbar searchlight if search assist not available.
 2012-11-12 08:00:19 -08:00