Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,532 Commits 3 Branches 0 Tags
aa9082bc799fd3d61a80d0bc95b0452100a3dca4
Commit Graph

15119 Commits

Author SHA1 Message Date
Jason parks
d4796c823b am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb 
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
  Update the encryption password when the device password is changed.
 2011-01-29 12:04:11 -08:00
Jason parks
a2e765ef1a Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00
Jean-Baptiste Queru
0044b4ad6a Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Nick Pelly
4226be3f04 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Jean-Baptiste Queru
0440cc1fb7 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
Kenny Root
c68a657f12 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
962d556a12 Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Nick Pelly
1ac6d08a05 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Jean-Baptiste Queru
bf9f3ea72e Merge 34afc2cd from gingerbread-plus-aosp 
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
 2011-01-29 08:45:29 -08:00
Nick Pelly
7a69ffa0e4 am 32f7d50d: am 21d0a173: Fix build - javadoc. 
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.
 2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
7d4b7dab39 Merge 55e124c4 from gingerbread-plus-aosp 
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
 2011-01-29 07:32:39 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6 Merge da01b4ab from gingerbread 
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
 2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
 2011-01-29 07:09:21 -08:00
Jim Miller
4485edce05 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-29 07:08:58 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Jeff Brown
2992ea782f Add "Use physical keyboard" option to system bar IME button. 
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
 2011-01-28 22:06:36 -08:00
Joe Onorato
7f51171ab3 am a0f2cdb5: Merge "999" into honeycomb 
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
  999
 2011-01-28 18:50:03 -08:00
Joe Onorato
a0f2cdb507 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684 999 
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
 2011-01-28 18:46:20 -08:00
Jeff Hamilton
df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge 
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
 2011-01-28 20:41:42 -06:00
Gilles Debunne
f1f409a389 Fxi initial error popup dialog in TextEdit and refreshed assets. 
Bug 3398923

Set the background of the popup when it is created so that the first
measure is correct.

New assets.

Change-Id: I4803754ef3115429a608d890f56c6b0c8033d253
 2011-01-28 18:30:52 -08:00
Joe Onorato
9fecc19f97 am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb 
* commit '430dde3ef3b9b82bfca4ae51e225c6ad88aee514':
  Don't force all views to be asking for lights out just because somebody did.
 2011-01-28 16:39:44 -08:00
Joe Onorato
430dde3ef3 Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb 2011-01-28 16:38:01 -08:00
Joe Onorato
957a189bf2 Don't force all views to be asking for lights out just because somebody did. 
Bug: 3396308
Bug: 3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
 2011-01-28 16:36:16 -08:00
Dianne Hackborn
7b7280fd07 am 6ec44395: Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 
* commit '6ec44395f304a478fb56f20ca5e941514ed0a48e':
  Fix issue #3403539: WordPress crashes on Honeycomb
 2011-01-28 16:35:40 -08:00
Dianne Hackborn
6ec44395f3 Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 2011-01-28 16:34:02 -08:00
Chet Haase
ec5de0874f am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb 
* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
  Fixed LayoutTransition bug moving multiple views
 2011-01-28 16:23:45 -08:00
Chet Haase
691d43c35f Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb 2011-01-28 16:19:32 -08:00
Chet Haase
0dfc398424 Fixed LayoutTransition bug moving multiple views 
The problem was that there can be >1 animation spawned for each
view in a container, if there are multiple events that trigger
a transition. These animations would potentially clobber object
layout values, causing problems as successive animations tried to use those
clobbered values to set up their own animation values.

The fix is to track the created animations and cancel them as future
animations on those same objects get created. This mechanism used to
be in the code (the bug came about when that mechanism went away), but
was removed because of memory leaks of never removing animations that
were set up but never started. The new approach also caches pending
animations, but runs a second aniamtor to delete the entries in that
collection just in case.

Change-Id: If60c7d188712334dea69d0794dc6b4ce29ca6c09
 2011-01-28 15:54:37 -08:00
Brian Muramatsu
910be3e855 am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb 
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
  Fix TextUtils#commaEllipsize
 2011-01-28 14:53:07 -08:00
Brian Muramatsu
9eaefb8213 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for. 
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
 2011-01-28 14:48:37 -08:00
Romain Guy
571a2c971b am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
  Prevent crash when detaching a SurfaceView. Bug #3400461
 2011-01-28 14:20:01 -08:00
Romain Guy
b0c939adfa Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Dianne Hackborn
1ec7e20237 Fix issue #3403539: WordPress crashes on Honeycomb 
Change-Id: Ia86e26b5bd266d8e3362a04e412a58b98a062d5f
 2011-01-28 14:11:17 -08:00
Gilles Debunne
06cedc1c4a am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb 
* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
  Fix for TextView's error popup behavior when using soft keyboard.
 2011-01-28 14:10:08 -08:00
Gilles Debunne
d11f5d2c5e Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb 2011-01-28 14:07:12 -08:00
Joe Onorato
d6874a105e am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
 2011-01-28 13:43:22 -08:00
Joe Onorato
b940659f41 am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
 2011-01-28 13:43:17 -08:00
Joe Onorato
cfd0bafdeb Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
 2011-01-28 13:40:45 -08:00
Joe Onorato
94eb3d0f7e Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 2011-01-28 13:40:28 -08:00
Jeff Hamilton
dac3063adb resolved conflicts for merge of a314f32b to honeycomb-merge 
Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500
 2011-01-28 13:16:46 -08:00
Dianne Hackborn
8691b7243d am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
 2011-01-28 12:46:51 -08:00
Dianne Hackborn
10e4148b62 Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 2011-01-28 12:44:52 -08:00
Dianne Hackborn
420829ef78 Fix issue #3291173: Problem report for NewsRoom - RSS News Reader 
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it.  Add a hack for
the framework to insert its own private factory.

Also fix a deadlock in the system process.

Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
 2011-01-28 12:21:54 -08:00
Jason parks
f7b3cd4efd Update the encryption password when the device password is changed. 
* Added changeEncryptionPassword() to the MountService.
* Update LockPatternUtils to call changeEncryptionPassword()
  when the password is changed.

Note we only require the new password to change the
encryption password.

Bug: 3382129
Change-Id: I26a7e919e325e75e22fa4290da0a8b1b57b55a80
 2011-01-28 13:52:37 -06:00