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

52950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
f0b517d9d2 Merge "may fix build on some version of gcc" 2011-06-14 11:51:24 -07:00
Mathias Agopian
f1df0407c6 may fix build on some version of gcc 
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
 2011-06-14 11:50:22 -07:00
Robert Ly
f25be17f64 cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7 
Conflicts:

	docs/html/guide/topics/usb/adk.jd

Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
 2011-06-14 11:50:19 -07:00
Dianne Hackborn
8a73d21184 am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
  Update resources documentation with new qualifiers.
 2011-06-14 11:42:09 -07:00
Dianne Hackborn
77fc8b8066 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
 2011-06-14 11:40:06 -07:00
RoboErik
bec6c36b96 Rename Calendar.java to CalendarContract.java 
Change-Id: Iadb22f39d1cb3d57d1636360df24ef484a9edb58
 2011-06-14 11:39:35 -07:00
Dianne Hackborn
74c48f2b2b am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '700a1f25719138b94c453beb6325e627a11a9883':
  Update resources documentation with new qualifiers.
 2011-06-14 11:38:01 -07:00
Dianne Hackborn
6c0533f994 am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
 2011-06-14 11:36:05 -07:00
Daisuke Miyakawa
a7932ae77e Merge "Fix commment" 2011-06-14 11:30:47 -07:00
Robert Ly
f197b639ec cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a 
Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
 2011-06-14 11:27:41 -07:00
Dianne Hackborn
700a1f2571 Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 2011-06-14 11:27:09 -07:00
Robert Ly
1431fd98b1 cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb 
Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
 2011-06-14 11:26:39 -07:00
Dianne Hackborn
c5193c6285 Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features. 
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
 2011-06-14 11:23:52 -07:00
Robert Ly
ef18aea78d cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac 
Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
 2011-06-14 11:21:30 -07:00
Robert Ly
de50cace6e cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d 
Change-Id: I88d74001d58176ac9ca24265512d92646c345488
 2011-06-14 11:20:33 -07:00
tedbo
114420f531 Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Alex Sakhartchouk
304b1f5497 Allocation copy functions. 
Change-Id: Idce6d44a4f4bb2e399284a40c0f90dc1bff912fd
 2011-06-14 11:13:19 -07:00
Chia-chi Yeh
fd1235fc34 Merge "VPN: do not allow zero prefix length in routing rules." 2011-06-14 10:58:20 -07:00
Chia-chi Yeh
57aa13ebde Merge "VPN: do not use gateway in routing rules." 2011-06-14 10:58:10 -07:00
Daisuke Miyakawa
52e3823bd7 Fix commment 
Change-Id: I26ea16636356c1473bf8745247b43fa9dac611c3
 2011-06-14 10:56:46 -07:00
Gilles Debunne
4d80280821 Bug 4579629. Send before and after text when suggestion is picked. 
Change-Id: Iaf8ad50b19e7301ece1a5a7a13b3bc604c817fd6
 2011-06-14 10:55:01 -07:00
Glenn Kasten
1d24aaa4b4 Bug 4608375 
Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
 2011-06-14 10:41:50 -07:00
RoboErik
b2e9cde84b Merge "Update Calendar main comment" 2011-06-14 10:27:12 -07:00
RoboErik
260598d0cf Update Calendar main comment 
Change-Id: I5fbbf8d6830a8fdecde2f74b51420bfede87cde9
 2011-06-14 10:26:41 -07:00
John Wang
7c1650d180 am aabe5f46: am 49572479: Update sim missing message in lock screen. 
* commit 'aabe5f46846a45163be874dca2d19910ce38c232':
  Update sim missing message in lock screen.
 2011-06-14 10:17:51 -07:00
Gloria Wang
85e76662b6 Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053." 2011-06-14 10:05:55 -07:00
John Wang
aabe5f4684 am 49572479: Update sim missing message in lock screen. 
* commit '49572479a9cb479f2b323f011c1a9f8142ec1a46':
  Update sim missing message in lock screen.
 2011-06-14 10:05:40 -07:00
Mike J. Chen
8068cb8e21 Merge "Handle always present wired ethernet interfaces at boot." 2011-06-14 09:53:23 -07:00
Narayan Kamath
9a67f26184 Merge "A few TTS bug fixes" 2011-06-14 07:05:42 -07:00
Narayan Kamath
0e20fe5bab A few TTS bug fixes 
(a) ensure that onInit is called exactly once per call to initTts().
(b) TtsEngines should never return an engine that is not installed.

Change-Id: Ic1ef63a9339e6d1050e3302445ca40d3ae481f61
 2011-06-14 13:29:20 +01:00
Narayan Kamath
3f0363bb4b Deprecate setEngineByPackageName 
This function does not let callers know when the TTS engine has
been initialized.

Change-Id: I17fcf3f95ad5bbdb9b787ba0846e6e63d424cd23
 2011-06-14 12:28:45 +01:00
Hung-ying Tyan
5621554033 Move WakeupTimer out of SipService. 
This is to prepare to move keepalive process to SipSessionGroup before fixing
the following bug.
Bug: 3464181

Change-Id: I57d8f6effad76706b5a76e1269c53d558db88ae4
 2011-06-14 17:46:48 +08:00
Jim Miller
70832a3d77 Some tuning for MultiWaveView animations and assets: 
- allow individual chevrons to be specified for (top, bottom, left, right).
- move ring to pressed position (currently w/o animation)
- add top/bottom chevron handling and refactor code accordingly.
- constrain drag handle to the ring

Change-Id: I859b2d03d8f0397c68b87a8ee15df20d55c9552c
 2011-06-13 23:57:31 -07:00
Jeff Sharkey
fcc79771f0 Generate default policy for devices without IMSI. 
Change-Id: I38500919ea60f78d99684608589c8fc3092bf239
 2011-06-13 22:28:34 -07:00
Dianne Hackborn
ce67da79e7 Update resources documentation with new qualifiers. 
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
 2011-06-13 22:01:13 -07:00
Mathias Agopian
8a8743efa4 Merge "cleanup Kalman filter parameters, add/fix comments/units" 2011-06-13 21:14:17 -07:00
Jeff Brown
3e234ba1fb Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
fa77931784 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Dima Zavin
922261deab Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
Mike Lockwood
82f0a85c3b Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager" 2011-06-13 19:22:29 -07:00
Mike Lockwood
1324f22d8d Settings: Remove unused USE_PTP_INTERFACE setting 
Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:21:01 -04:00
Mike Lockwood
541c9949ae Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager 
Change-Id: I9e64b54bc2d027d88ae2d2cd893068e29b6fe237
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:20:06 -04:00
Romain Guy
ad4e03d697 Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX." 2011-06-13 19:07:22 -07:00
Romain Guy
54be1cdf3d Batch glCopyTexImage() calls to get about 15 fps back on SGX. 
Change-Id: I04079e070739c1e46df3e90fc388c335e2a7d2b9
 2011-06-13 19:04:27 -07:00
James Dong
6e4ba2bf35 Merge "Add an option to force to use HW codec in stagefright cmd tool" 2011-06-13 18:47:20 -07:00
Mathias Agopian
451e825847 cleanup Kalman filter parameters, add/fix comments/units 
Change-Id: Iedcae7164af8f7ea0e048ea7c72d0f35d16d739f
 2011-06-13 18:47:17 -07:00
James Dong
decbe327d1 Merge "Add B frame support for MPEG4Writer" 2011-06-13 18:47:03 -07:00
Adam Powell
2714abff5c Merge "Expose api on View to determine if the view can be scrolled." 2011-06-13 18:45:40 -07:00
Mathias Agopian
14f58ffceb Merge "fix RefBase so it retains binary-compatibility with gingerbread" 2011-06-13 18:44:20 -07:00