Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,916 Commits 3 Branches 0 Tags
522ea25f2be384fd027ce2f644ee647fd8d80634
Commit Graph

10743 Commits

Author SHA1 Message Date
Andrew Stadler
eb91e78ff9 Merge "Fix crash when proxy exclusion list is null." 2010-08-31 14:38:49 -07:00
Mike Lockwood
f06a449951 Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications" 2010-08-31 14:32:39 -07:00
Andrew Stadler
ac19f24cc1 Fix crash when proxy exclusion list is null. 
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
 2010-08-31 14:28:58 -07:00
Mike Lockwood
d20e802512 Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00
Mike Lockwood
6ed727e39e Merge "USB: Add functions for querying if a USB function is supported and enabled." 2010-08-31 13:46:35 -07:00
Mike Lockwood
2837eefc54 MTP: Send an Intent after an MTP session that resulted in media database modifications 
Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-31 16:25:12 -04:00
Romain Guy
2cbe236138 Merge "Add hooks for hardware accelerated WebView." 2010-08-31 11:51:08 -07:00
Romain Guy
da8532c6f4 Add hooks for hardware accelerated WebView. 
Change-Id: I907cdec8a67594f87749ac46bda85f04af5a2003
 2010-08-31 11:50:35 -07:00
Mike Lockwood
eabe8bfaf8 Add settings option for running MTP server in PTP mode. 
This can be used as a compatibility workaround for host operating systems
without MTP support.

Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-31 14:35:23 -04:00
Mike Lockwood
08bff3b9d4 USB: Add functions for querying if a USB function is supported and enabled. 
Change-Id: I5fc24960e1e01c27e892acc2e76c12ddf8c654cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-31 13:27:05 -04:00
Jeff Brown
6b2a75751d am be990e97: am 6eb5ac9c: Fix doc link in InputDevice. 
Merge commit 'be990e97a93f029c0ecc77a1bba66ea92057e5e4'

* commit 'be990e97a93f029c0ecc77a1bba66ea92057e5e4':
  Fix doc link in InputDevice.
 2010-08-31 10:10:41 -07:00
Jeff Brown
be990e97a9 am 6eb5ac9c: Fix doc link in InputDevice. 
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp

* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
  Fix doc link in InputDevice.
 2010-08-30 23:32:40 -07:00
Jeff Brown
6eb5ac9cee Fix doc link in InputDevice. 
Change-Id: I3b356b8e3803661ccfe5bb4812021b6c6d576d21
 2010-08-30 23:29:07 -07:00
Irfan Sheriff
ef6c1431fa Fix reboot loop due to NPE 
Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
 2010-08-30 20:40:19 -07:00
Adam Powell
a9c43aaa44 am 0a77ce27: New edge effects for scrolling widgets (overscroll) 
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp

* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
  New edge effects for scrolling widgets (overscroll)
 2010-08-30 19:19:37 -07:00
Adam Powell
0a77ce277c New edge effects for scrolling widgets (overscroll) 
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.

Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
 2010-08-30 19:14:07 -07:00
Bai Tao
224744cc72 Store the current country in call log 
Change-Id: Ia68f8e0280b89d5993abb2701a3c425a147b51ba
 2010-08-31 09:59:13 +08:00
Adam Powell
e30e1ff8bc am 7d04f2bc: am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 
Merge commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341'

* commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
 2010-08-30 18:38:14 -07:00
Adam Powell
7d04f2bc4e am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp

* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
 2010-08-30 18:35:58 -07:00
Adam Powell
4c72ad75cf Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 2010-08-30 18:33:20 -07:00
Jeff Brown
22f5ee9374 am 36f0cb26: am 8d60866e: Input device calibration and capabilities. 
Merge commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030'

* commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030':
  Input device calibration and capabilities.
 2010-08-30 18:29:12 -07:00
Brad Fitzpatrick
02f4f0eb49 am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread 
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'

* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
  Renaming SharedPreferences$Editor.startCommit to apply
 2010-08-30 18:25:02 -07:00
Adam Powell
9c17a4c110 Fix bug 2918587 Infinite loop and memory leak in AdapterView 
Change-Id: Icb63b186c56c2d731003dc38a8ff7a93a69a94e7
 2010-08-30 18:23:26 -07:00
Jeff Brown
36f0cb26cb am 8d60866e: Input device calibration and capabilities. 
Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp

* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
  Input device calibration and capabilities.
 2010-08-30 18:22:32 -07:00
Brad Fitzpatrick
734d270769 am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread 
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp

* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
  Renaming SharedPreferences$Editor.startCommit to apply
 2010-08-30 18:18:54 -07:00
Jeff Brown
8d60866e21 Input device calibration and capabilities. 
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects.  The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.

Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
 2010-08-30 18:16:43 -07:00
Brad Fitzpatrick
66fce5068a Renaming SharedPreferences$Editor.startCommit to apply 
Also removes the artifical restriction that only one apply() can be in
flight at once.  That was old from when I thought it'd end up being
required, but wasn't.

Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
 2010-08-30 18:10:49 -07:00
Robert Greenwalt
37e65ebb7e Rename NetworkProperties to LinkProperties 
Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
 2010-08-30 15:54:37 -07:00
Jean-Baptiste Queru
86aeac9844 am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed." 
Merge commit '1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp

* commit '1d22e122a6f278a432519673a8ad3e4853934461':
  Fix a monkey crash when the new WebView is destroyed.
 2010-08-30 15:21:51 -07:00
Jean-Baptiste Queru
1d22e122a6 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Gloria Wang
9bc4dbb377 Merge "Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'"" 2010-08-30 14:43:11 -07:00
Gloria Wang
45bc5eca2b Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'" 
Change-Id: Id98df7dcdfa4119783fca6cb5478df5b99050738
 2010-08-30 14:29:31 -07:00
Wu-cheng Li
b8f7f42f70 am 6e46e6f7: am 7ec7b997: Remove camera metering mode API. 
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
  Remove camera metering mode API.
 2010-08-30 14:06:16 -07:00
Wu-cheng Li
6e46e6f748 am 7ec7b997: Remove camera metering mode API. 
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp

* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
  Remove camera metering mode API.
 2010-08-30 13:48:07 -07:00
Wu-cheng Li
7ec7b9970c Remove camera metering mode API. 
Metering mode is not supported yet.

Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
 2010-08-30 13:33:53 -07:00
Jean-Baptiste Queru
9773cd73b6 am f470ed86: Merge "Support surrogate pairs when layouting text" 
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
 2010-08-30 13:20:41 -07:00
Romain Guy
7dff1a7214 Make profiling easier. 
Change-Id: I3d4a0a0ead72569a8950bc986dfe584b186e0d65
 2010-08-30 12:49:07 -07:00
Daisuke Miyakawa
da2ccb49b1 Merge "Fix NPE when Spinner is reused." 2010-08-30 12:22:47 -07:00
Daisuke Miyakawa
3f10b1c8f8 Fix NPE when Spinner is reused. 
Bug: 2958228
Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
 2010-08-30 11:52:35 -07:00
Patrick Dubroy
6dabe240ed Add an Intent category for apps that provide an app market. 2010-08-30 11:29:10 -07:00
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location. 
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 13:35:03 -04:00
Derek Sollenberger
3a23a3f367 am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:34:23 -07:00
Derek Sollenberger
a3faa923a0 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:06:36 -07:00
Derek Sollenberger
6726d6bb1a Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -07:00
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE 
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
 2010-08-27 20:00:29 -07:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE 
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
 2010-08-27 22:57:39 -04:00
Kenny Root
818c830c59 am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread 
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
 2010-08-27 18:11:06 -07:00
Wu-cheng Li
769690e9ea am af610b2b: am 1620d118: Fix SDK build error. 
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048'

* commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048':
  Fix SDK build error.
 2010-08-27 18:10:17 -07:00
Wu-cheng Li
7fe6d3f13a am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'

* commit '705c2e66dcb358c865cf912a5496825088044b79':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 18:09:48 -07:00
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00