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

47286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
dfcb8c5116 Merge "Don't accept a user-defined dun-capable connection" into gingerbread 2011-03-10 10:41:36 -08:00
Rajneesh Chowdury
e7defc2975 Fix for 4080402 NPE in Transition.setDuration 
Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
 2011-03-10 10:35:42 -08:00
Gilles Debunne
36198d7bab Merge "Empty spans are not considered in text layout/rendering process." 2011-03-10 10:21:34 -08:00
Gilles Debunne
9646145dec Merge "Fixed TextView#onTextChanged documentation." 2011-03-10 10:21:20 -08:00
Wink Saville
423e5b66e5 Merge "Telephony: Rename lte_on_cdma property." 2011-03-10 09:53:54 -08:00
Shimeng (Simon) Wang
83c590a2fa am 40f24016: am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1 
* commit '40f240166a5d4c92690aeb991f1711bf3a733ef5':
  Don't limit zoom scale change by the minimum increment.
 2011-03-10 09:49:49 -08:00
Kristian Monsen
9610d3e98f am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 
* commit '4543b8d4b0fe6bebbf619fa7793a55e41eb1eeff':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
 2011-03-10 09:49:42 -08:00
Ramesh Sudini
4ae87a8b04 Telephony: Rename lte_on_cdma property. 
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I51bab8cf1346ef8d23e425cbb32ae7b4a3d7ce09
 2011-03-10 09:09:08 -08:00
Shimeng (Simon) Wang
40f240166a am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1 
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
  Don't limit zoom scale change by the minimum increment.
 2011-03-10 09:07:22 -08:00
Kristian Monsen
4543b8d4b0 am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
 2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
0837fde9fd Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1 2011-03-10 09:04:12 -08:00
Kristian Monsen
79b87df588 Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 2011-03-10 09:01:58 -08:00
Mike Lockwood
26d7eef69e am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
  UsbAccessory: Add URI string, replace type string with description
 2011-03-10 07:56:59 -08:00
Mike Lockwood
84edf14b62 am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
  UsbAccessory: Add URI string, replace type string with description
 2011-03-10 07:52:30 -08:00
Mike Lockwood
cc08c439bc Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00
Kristian Monsen
63a1b0cefe Fix for bug 4064291 WebView uses PackageManager#getInstalledApps 
Checking each app if they exist instead of iterating through
all packages.

Change-Id: Ic4934fa1e8dbbab2f90134e3701d39b1d4739d83
 2011-03-10 11:30:43 +00:00
Chih-Wei Huang
c2d68c9096 Remove unnecessary SkImageDecoder_libjpeg.cpp 
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
 2011-03-10 17:52:31 +08:00
TK MUN
a3ae42ef0a am ce475995: (-s ours) am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support 
* commit 'ce475995740942d75eda7af820072c765256ec73':
  DO NOT MERGE WiMAX support
 2011-03-09 23:03:16 -08:00
TK MUN
ce47599574 am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support 
* commit 'c01fd043a92462f12210d45a92d751b49e0e1f62':
  DO NOT MERGE WiMAX support
 2011-03-09 22:58:12 -08:00
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support 
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
 2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support 
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 22:37:08 -08:00
Jim Miller
3fa8a454f6 Fix 3201849: Enable hardware acceleration in LockScreen WaveView 
Change-Id: Id64e82fe2e09ac231736d7867cd47b504d79b81b
 2011-03-09 19:47:56 -08:00
Jeff Brown
9b12dbdd1e am 4ffdca06: am 3de30a4c: Update API. 
* commit '4ffdca06ec5575ddaa215941c1cc21de96e76bcb':
  Update API.
 2011-03-09 19:37:49 -08:00
Jeff Brown
4ffdca06ec am 3de30a4c: Update API. 
* commit '3de30a4c1e48d92af14154abddd4fb6fe0c6aa13':
  Update API.
 2011-03-09 19:35:28 -08:00
Jeff Brown
3de30a4c1e Update API. 
Not sure the changes were correctly rebased last time.

Change-Id: If6ab4014f312bef240df60f0b1cd6d923f472836
 2011-03-09 19:13:11 -08:00
Mike Lockwood
ac36d7c715 UsbAccessory: Add URI string, replace type string with description 
This is a first step toward adding USB accessory URI support

BUG: 4073248

Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)

Also added test for USB accessory protocol version to accessorytest

BUG: 4080288

Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 22:12:49 -05:00
Jeff Brown
5a3d6cc188 am e6f0ae12: am efd3266b: Input improvements and bug fixes. 
* commit 'e6f0ae12b18819424dd8395b433a8fc9caefa77b':
  Input improvements and bug fixes.
 2011-03-09 18:39:46 -08:00
Jeff Brown
614ef8df70 am 0cbc4a6c: (-s ours) am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE) 
* commit '0cbc4a6c3ce795497ac136736dacf5eeb0ffa6ac':
  Recognize 3D joysticks.  (DO NOT MERGE)
 2011-03-09 18:39:43 -08:00
Jeff Brown
e6f0ae12b1 am efd3266b: Input improvements and bug fixes. 
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
  Input improvements and bug fixes.
 2011-03-09 18:36:52 -08:00
Jeff Brown
0cbc4a6c3c am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE) 
* commit '9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
  Recognize 3D joysticks.  (DO NOT MERGE)
 2011-03-09 18:36:46 -08:00
Jeff Brown
cbd0431438 am 76d84845: (-s ours) am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 
* commit '76d848454f5d6f8b6d087eccc81c6bb51dd46c55':
  Fix off by one errors in touch motion ranges.  (DO NOT MERGE)
 2011-03-09 18:31:56 -08:00
Jeff Brown
7115e796b5 am bbb5f5ac: (-s ours) am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1 
* commit 'bbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a':
  Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)
 2011-03-09 18:31:52 -08:00
Jeff Brown
58ce180f40 am e2296212: (-s ours) am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1 
* commit 'e2296212194a74438d80f77bc3d68d88b1f2be09':
  Make PointerLocationView also log generic motions and some keys.  (DO NOT MERGE)
 2011-03-09 18:31:47 -08:00
Jeff Brown
efd3266b71 Input improvements and bug fixes. 
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis.  This fixes new API that was introduced in MR1.
(Bug: 4066146)

Fixed a bug that might cause a segfault when using a trackball.

Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.

Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.

Improved the batching code to support batching events from different
sources of the same device in parallel.  (Bug: 3391564)

Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
 2011-03-09 18:30:28 -08:00
Jeff Brown
9e8e40cb5f Recognize 3D joysticks. (DO NOT MERGE) 
Change-Id: Idf7799ea90fa07677850d40ee1aec39220ded372
 2011-03-09 18:30:28 -08:00
Jeff Brown
76d848454f am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 
* commit '18955491ee52aad9bfe6f06e46da77aed6ee092a':
  Fix off by one errors in touch motion ranges.  (DO NOT MERGE)
 2011-03-09 18:29:31 -08:00
Jeff Brown
bbb5f5ac36 am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1 
* commit '55605c9e24887693d507f31bee4cde0690bbccff':
  Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)
 2011-03-09 18:29:26 -08:00
Jeff Brown
e229621219 am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1 
* commit '06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
  Make PointerLocationView also log generic motions and some keys.  (DO NOT MERGE)
 2011-03-09 18:29:22 -08:00
Jeff Brown
18955491ee Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:25 -08:00
Jeff Brown
55605c9e24 Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:22 -08:00
Jeff Brown
06a0c9f5ee Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:16 -08:00
Dianne Hackborn
439cca140a am f49c3ae2: am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1 
* commit 'f49c3ae2da7b6343088200bdafdf6e9906258bf4':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
 2011-03-09 18:05:40 -08:00
Dianne Hackborn
f49c3ae2da am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1 
* commit '7fd981598ed0ec275d6da27c71e5e6c9db854e82':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
 2011-03-09 18:02:53 -08:00
Dianne Hackborn
7fd981598e Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1 2011-03-09 18:00:10 -08:00
Shimeng (Simon) Wang
3911b45005 Don't limit zoom scale change by the minimum increment. 
issue: 4080125
Change-Id: I3fa258e12e7aa44c7286c9dccb1f249d5ae78a12
 2011-03-09 17:55:35 -08:00
Ken Sumrall
0da47dae49 Teach the framework to use the new android_reboot() function. 
The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems.  This fixes bug 3350709.

Change-Id: I792fa3f726f8d685a696f52cf760e731567ed8d4
 2011-03-09 17:37:52 -08:00
Gilles Debunne
4469e60e9e Fixed TextView#onTextChanged documentation. 
Bug https://code.google.com/p/android/issues/detail?id=14804

Change-Id: I3356800b680ff79cc2fe099845634bb8d9b96ec6
 2011-03-09 17:20:36 -08:00
Mathias Agopian
686d8370e4 am abe5c079: am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread 
* commit 'abe5c079440a0903085bc748c955d5b2b820a370':
  revert the surface purgatory list and dependent changes.
 2011-03-09 17:20:01 -08:00
Gilles Debunne
1e3ac18e7a Empty spans are not considered in text layout/rendering process. 
Bug http://code.google.com/p/android/issues/detail?id=14786

Empty spans are affecting the text before and after them. See the
comment in TextUtils.removeEmptySpans for details.

Change-Id: I40376c32fd56a17efde6219f9b2593e4b4ab1ba1
 2011-03-09 17:17:40 -08:00
Mathias Agopian
abe5c07944 am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread 
* commit 'a15b5290f5785031ec4813fd7e141a9fc39c18fa':
  revert the surface purgatory list and dependent changes.
 2011-03-09 17:17:24 -08:00