33629 Commits

Author SHA1 Message Date
Thomas Tafertshofer
dd06946252 updated gles20 bindings, fixes broken methods
this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old functions are still there and need to be @hide later.

Bug: 6006380
Change-Id: I8127a77c4b89aa8a9a54bea88774077535e2139d
2012-07-19 17:04:47 -07:00
Nick Kralevich
2c932143ff Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks" 2012-07-19 16:25:42 -07:00
Jeff Brown
84f85dc70a Merge "Fix keyguard wake-up issue." 2012-07-19 15:05:50 -07:00
Jeff Brown
ff1baef86c Fix keyguard wake-up issue.
Bug: 6835809
Change-Id: I7a23b50286592b4c4b104b0b6429f2d05fb5e01b
2012-07-19 15:01:17 -07:00
Ying Wang
827c182390 Merge "Import translations. DO NOT MERGE" 2012-07-19 14:46:25 -07:00
Adam Powell
d81cc4ab5a Easy "Just once" launches from ResolverActivity
Allow a second tap of a selected item in ResolverActivity to launch
the target as "just once" for sloppier/quicker choices.

Change-Id: If05fc7c1ac622195f6253e6ca0868fd87954dd46
2012-07-19 14:14:50 -07:00
Ying Wang
a7c7d759b3 Import translations. DO NOT MERGE
Change-Id: Ibe8cf6252d630b4ff9a36e81677443773bc0e5f0
Auto-generated-cl: translation import
2012-07-19 13:23:59 -07:00
Adam Powell
1825b984b4 Merge "Fun with Up navigation" 2012-07-19 11:49:37 -07:00
Steve Block
60620a2399 Merge "Update JavaDoc for PictureListener after fix to capture layers" 2012-07-19 11:44:08 -07:00
John Reck
b077e243ba Merge "Test aggressive throttling" 2012-07-19 11:28:33 -07:00
Adam Powell
0fc5b2bea0 Fun with Up navigation
For activities with a null taskAffinity, simply finish the current task.
(They probably shouldn't have specified a parentActivityName anyway.)

When launching into app info from ResolverActivity, launch the app info
page in the current task with FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET. Back
will return to the resolver, and Up will jump to Settings.

When launching into app info from RecentsPanelView or BaseStatusBar,
since this is a system affordance akin to notifications or widgets,
build the full task stack for the app info activity with
TaskStackBuilder and launch it as a new task.

Change-Id: I73b1941d0f52bd8b30382b5e17edd8ceb058c70d
2012-07-19 11:24:47 -07:00
Steve Block
72498edd88 Update JavaDoc for PictureListener after fix to capture layers
Bug: 6389297
Change-Id: I970942f926effbb072ae306c994d25c0e77e3810
2012-07-19 17:02:06 +01:00
Satoshi Kataoka
4e5184f929 Fix a crash in InputMethodManager when switching the IME in the system process
Bug: 6789252
Change-Id: I66f51da1299532793ef8fa700f35b0811670f235
2012-07-19 20:32:51 +09:00
Ying Wang
d173b10a93 am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'a4d4df16a6d18add37971bbd41ba58b4ce2ee608':
  Import translations. DO NOT MERGE
2012-07-18 20:14:46 -07:00
Mathias Agopian
d48a84cea5 Merge "Updated OpenGL bindings to fix nio buffer crash" 2012-07-18 18:31:28 -07:00
Raph Levien
592b29f4ad Merge "Increase text layout cache size in bytes" 2012-07-18 16:20:20 -07:00
Fabrice Di Meglio
9a1aa4c4a4 Merge "Fix padding resolution" 2012-07-18 16:17:31 -07:00
Raph Levien
161ebab85d Increase text layout cache size in bytes
The mark positioning changes increase the number of bytes needed per
glyph from 6 to 14. This patch compensates by allocating more total
memory for the text layout cache.

Change-Id: I3cf59547394a41779cf6e92e67688b0fdc85f1a3
2012-07-18 16:16:41 -07:00
Fabrice Di Meglio
016456e432 Fix padding resolution
Change-Id: I2181a0a4057be0d20744b1512dbc1fbc53490d81
2012-07-18 16:14:57 -07:00
Raph Levien
4f3c8f7026 Fix overly verbose logging in TextLayoutCache
I meant to log certain debug values only when DEBUG_GLYPHS was set, but
I used #ifdef instead of #if (when it's not set, it's 0, rather than
undefined).

Change-Id: Ic27fee7dd355009c1873f0a2e12614849bbceebd
2012-07-18 15:40:44 -07:00
Ying Wang
0734102f44 Merge "Import translations. DO NOT MERGE" 2012-07-18 14:58:43 -07:00
Ying Wang
8558a2e067 Import translations. DO NOT MERGE
Change-Id: I25f1161117b937662eeb0ed5c52b9ee8e470ad47
Auto-generated-cl: translation import
2012-07-18 14:32:47 -07:00
Adam Powell
a9108a217e Add View#generateViewId; make RadioGroup use it
Bug 6448164

generateViewId provides a way for applications to generate opaque ID
values suitable for use with View#setId that will not collide with
values generated by aapt for R.id.

Fix a bug where RadioGroup assumes object hash codes will always be
positive.

Change-Id: I3e2870cd672d6061bb465128f428c81aeef0c44b
2012-07-18 14:27:00 -07:00
Ying Wang
eebabd6e47 Import translations. DO NOT MERGE
Change-Id: I5077a3d3cb71f2dff0f460174134bdc49663e27b
Auto-generated-cl: translation import
2012-07-18 14:19:56 -07:00
Raph Levien
57bdd3d378 Merge "Software-only implementation of glyph positioning (bug 5443796)" 2012-07-18 08:40:19 -07:00
Raph Levien
2301d32f7e Software-only implementation of glyph positioning (bug 5443796)
This patch implements glyph positioning in the Skia-based renderer. Note
that it depends on a fix for bug 6833339 being in place (correct
calculation of advance widths under skew and scale transforms),
otherwise there will be regressions.

Careful attention was paid to correct results in a wide variety of
conditions: alignments, text decorations, scale, skew, etc. Many of
these are exercised in the test app attached to bug 6833339.

Note that this patch also changes slightly the way that the total
advance is calculated - the running is accumulated and passed through to
computeRunValues(), so that the x positions of each glyph can be set
according to the total advance of all glyphs (in all runs) appearing
before (plus, of course, the offset for mark positioning).

After committing this patch, text rendering will no longer match between
the software and hardware rendering cases. Implementing positioning in
the hardware renderer will resolve that, and fully implement bug 5443796.

Change-Id: Ie0f7835d48bc120475a19afbfe159aa5304fcaa8
2012-07-17 18:11:28 -07:00
Haoyu Bai
db3c8678e5 Network data activity change intent for network interfaces.
The activity notification is received from netd, an intent
DATA_ACTIVITY_CHANGE is then raised for other part of the system to
consume.

Change-Id: Idfcc4763c51c5b314c57f546c12557082f06bebf
2012-07-17 17:13:03 -07:00
Jonathan Dixon
f6468ca4dc Merge "Remove deprecated methods from webview provider interface" 2012-07-17 15:41:29 -07:00
Adam Powell
5d1f11d9c2 Merge "Fix MediaRouteActionProvider button sizing" 2012-07-17 14:03:59 -07:00
Adam Powell
8c1b02e759 Fix MediaRouteActionProvider button sizing
Bug 6768999

Use proper layout height for MediaRouteButtons generated from
MediaRouteActionProvider.

Update ActionMenuView's LayoutParams handling to correctly propagate
width/height values if the supplied LayoutParams is of a different
type.

Change-Id: I1e1b250d873869ca27f59ffb06ccf2299d57b40d
2012-07-17 13:57:59 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-17 12:23:09 -07:00
Ying Wang
166615f243 am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '1ed1c399939e035707dd6da7057570a8da96394e':
  Import translations. DO NOT MERGE
2012-07-17 12:22:31 -07:00
Catherine Liu
fb90081351 Fix wrong count return for getPhoneSignalStrengthCount
Test report for the time spent in each signal strength bin, along
with the number of times that bin was entered showed the result
as Bin=3 Time=3211926000 Count=0. With a non-zero Time, the Count
value 0 was wrong.

The cause of the problem was that getPhoneSignalStrengthCount() used
mPhoneDataConnectionsTimer, instead of mPhoneSignalStrengthsTimer,
to get the count.

Change-Id: I55ac1125abfcfdc105605d76d1c706ac315b90cc
2012-07-17 14:12:56 -05:00
Ying Wang
59a4cb36cf Import translations. DO NOT MERGE
Change-Id: I7055f4855c1e911d218fef9ba3167b28c3077840
Auto-generated-cl: translation import
2012-07-17 11:38:59 -07:00
Ying Wang
7b3813340d Import translations. DO NOT MERGE
Change-Id: I5c3c2a4556764f14d354ea0431b6cba175b2c49f
Auto-generated-cl: translation import
2012-07-17 11:31:03 -07:00
Steve Block
6bcb45934e Merge "Improve JavaDoc for WebView.restoreState()" 2012-07-17 08:22:31 -07:00
Steve Block
42499061be Improve JavaDoc for WebView.restoreState()
Change-Id: I01b3f8ac78b08ef0a6f563fa63978934a23fd183
2012-07-17 16:01:38 +01:00
Fred
a8c6df0d3a Removed startService() call from BluetoothManagerService.
BT enable()/disable() are handled by using the binder interface

Change-Id: I0bb8d4984129706e424320241ca3ea7e12caf0d3

Conflicts:

	core/java/android/bluetooth/IBluetooth.aidl
2012-07-16 21:29:44 -07:00
Matthew Xie
9631314e3d Fix merge error, put in tmp workaround for input manager.
Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread

Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
2012-07-16 21:29:12 -07:00
fredc
5a1195fd5f Fixed issue with ActivityChooserView not working if there is only 1 share option available
Change-Id: If21742f3ddc28f54bf8da6cbc7e81ee0df19d6f0
2012-07-16 21:28:28 -07:00
fredc
bf072a712f Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to BluetoothManagerService
Change-Id: I88e5f3fe050cf11eae9c5cf1b7c393a178b8f9b1
2012-07-16 21:28:12 -07:00
Swaminatha Balaji
20738945d4 Auto connect hf/a2dp
Change-Id: I7c1fb4e2614f65e6810f195814dcf0cad88aee21
2012-07-16 21:26:46 -07:00
zzy
7329e70841 Added code to tear down dhcp thread when tethering is off 2012-07-16 21:25:57 -07:00
fredc
d6883533e4 Fixed socket not closing on BT off. Used RemoteCallbackList to monitor binder deaths in BluetoothManagerService.
Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
2012-07-16 21:25:05 -07:00
fredc
903ac6f399 Fixed issue with Settings app crashing after during on/off and unpair.
Fixed issue with BluetoothAdapter.getRemoteDevice() returning null.

Change-Id: Ie86813532530a6b57bde1c430c7b4875ecc7354c
2012-07-16 21:24:32 -07:00
Ravi Nagarajan
7077272d8f Disable debug logs in BluetoothDevice, that was turned on accidentally Change-Id: I8a0a3f5775c2b9f5a928e4840851e687f25b57ab 2012-07-16 21:24:09 -07:00
fredc
116d1d4696 Fixed issue with getting Bluetooth adapter's name and airplane mode
Change-Id: I18b632223574aa41b09ba30de8e35417fad86cbe
2012-07-16 21:23:34 -07:00
Sreenidhi T
4bedba49fe Change done in BluetoothAdapter to use the same API for interacting with the Bluetooth Service. setName was being done using mService while getName was using mManagerService. As a result, the device name was not being updated in Localadapter getname call. Modified to use mService in both cases.
Change-Id: I2e900a782df11fd511319fbb42d94324e50ae89b
2012-07-16 21:22:32 -07:00
Kausik Sinnaswamy
a097f51e5f BT enable adapter API should return TRUE or FALSE.
Change-Id: Iaef14c51d3407b69505c55a0bbdaf902213402cf
2012-07-16 21:21:23 -07:00
fredc
0f42037eb7 Non persistent adapter service
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java
2012-07-16 21:20:54 -07:00