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

36718 Commits

Author SHA1 Message Date
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -08:00
Adam Powell
05c8f17f05 Merge "resolver list is not cleared on rebuild" 2012-12-03 11:04:21 -08:00
Roger Chen
56dc91f7ce Change the text color of timer in MediaController 
The color of timer and backgroud in MediaController
are too closer to distinguish.

Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2012-11-30 08:58:43 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop" 
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
 2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
Johan Redestig
636c0ff499 Make transactGetSockaddr locale safe 
Explicitly use Locale.US transactGetSockaddr to avoid
unexpected results in some locales.

Change-Id: If8316e543e21e133dc0c821cc390a2b55fe6fcdf
 2012-11-23 11:19:20 +01:00
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE 
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
 2012-11-22 21:52:46 -08:00
László Dávid
c5d43f76fd Fix infinite recursive loop 
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
 2012-11-23 00:26:22 +01:00
You Kim
43a5070e06 resolver list is not cleared on rebuild 
Refactoring ResolverActivity.java

Change-Id: I84e6420ff98ddcafd27a52b041ddb1c50e7d7362
Signed-off-by: You Kim <you.kim72@gmail.com>
 2012-11-21 23:23:45 +09:00
Baligh Uddin
0edbc0eb76 Import translations. DO NOT MERGE 
Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import
 2012-11-20 22:35:34 -08:00
Adam Powell
6e8c1495f6 Merge "Re-read shortcut labels if the language has changed" 2012-11-20 13:59:45 -08:00
Svetoslav Ganov
e9812bae0e Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 2012-11-19 15:50:19 -08:00
Svetoslav Ganov
7018cfdc05 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back) 
This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789ce72bc423793315a51aea8b6bad6c7

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b
 2012-11-19 15:20:27 -08:00
Daniel Sandler
aaec726948 Notification vibration improvements: [DO NOT MERGE] 
- 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 same
   vibration pattern but can be changed easily in future.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
 2012-11-19 15:12:24 -08:00
Mattias Falk
eb573418a7 Re-read shortcut labels if the language has changed 
The shortcut label isn't updated to the current language
if the phone's language has changed.

The problem was that the shortcut label is stored in a
static variable which is set once and kept throughout the
life time of the process.

Change-Id: I89c5875fbf28fb82e073166c472ca205d28674fb
 2012-11-19 09:31:19 +01:00
Baligh Uddin
9d45abd4aa Import translations. DO NOT MERGE 
Change-Id: I90b5f538f6faf18d571907acaa96372894619c87
Auto-generated-cl: translation import
 2012-11-16 13:49:29 -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
Kenny Root
6b77645aa9 Switch keystore to binder 
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
 2012-11-14 08:45:52 -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
John Spurlock
4299f63e54 am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
Baligh Uddin
fadf669344 Import translations. DO NOT MERGE 
Change-Id: Ic0e6487087282230326fbd20063b47ad9205ee53
Auto-generated-cl: translation import
 2012-11-12 07:40:52 -08:00
Andy McFadden
9d42794dde am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
  Reduce emulator logspam
 2012-11-09 22:45:26 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
 2012-11-09 22:41:51 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -08:00
John Spurlock
43d84518f2 Disable navbar searchlight if search assist not available. 
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
 2012-11-09 10:27:33 -05:00
Andy McFadden
325be8a1ea Reduce emulator logspam 
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
 2012-11-08 16:40:21 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
 2012-11-08 15:47:46 -08:00
Chris Wren
b3e8071d81 am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b1d094ba104f804d152b83517bb7500304f6bae8':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:47:36 -08:00
Jim Miller
b67cba3355 am 2b49dd1c: am 6c7d2c24: am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit '2b49dd1c6e0bc9e0fee38f4bdf8889cb791ca81e':
  Don't show ECA in landscape mode on phones.
 2012-11-08 15:47:09 -08:00
Jim Miller
061b4fae3d am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:47:04 -08:00
Adam Powell
70eeec5c06 am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
  add bouncer frame to glowpad.
 2012-11-08 15:46:58 -08:00
Daniel Sandler
b57693d7c4 am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit 'e7689b82fa8a544289e7bcbb33ac6b33da6c9648':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 15:46:32 -08:00
Adam Powell
805f386d51 am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
  Fiddle with keyguard glowpad layouts
 2012-11-08 15:46:25 -08:00
Jim Miller
23b94022ba am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3a191b495c886a654f33fe717467a74975137e58':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 15:46:07 -08:00
Winson Chung
1540a21f3d am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
  Fixing up overscroll asset / sizing
 2012-11-08 15:45:55 -08:00
Svetoslav Ganov
09b6f4bbff am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '8fa69381f212b85ec9156e0a95382cd3ff312444':
  Slide unlock cannot get accessibility focus.
 2012-11-08 15:45:48 -08:00
Jim Miller
0927eb2112 am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard
 2012-11-08 15:45:43 -08:00
Adam Cohen
92f828f2a4 am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:45:35 -08:00
Satoshi Kataoka
ae41ba1563 am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '4424951fa566b3bf6e57b08f615facc680059164':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-08 15:44:26 -08:00
Justin Koh
3e94c56215 am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 
* commit 'cd38c32d85c13fde87ca7bee501cbe35230078b6':
  Catch exception of nonfound activities
 2012-11-08 15:43:34 -08:00
Daniel Sandler
7f83ef619a am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'ccbfd617e730e5c3660fb3b9edf4f272db4abfd0':
  Fix docs to refer to the correct class.
 2012-11-08 15:42:51 -08:00