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

43393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
98bf25269d Merge "Protected surface API" 2011-01-28 15:18:43 -08:00
Eric Fischer
566a216eed am 6a18f6e2: (-s ours) am 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '6a18f6e289f1bd6cdb4a3b73015935fac1c9b11d':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:13:50 -08:00
Eric Fischer
6a18f6e289 am 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '0982dc6488a921d9d54d23b9180a9acf33c61526':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:11:14 -08:00
Eric Fischer
0982dc6488 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:16 -08:00
Justin Ho
d73343e43c am d1bde71a: am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb 
* commit 'd1bde71ad917218949555724722cdef7139d5ac9':
  Correct font size for notifications & control panel.
 2011-01-28 15:07:37 -08:00
Justin Ho
d1bde71ad9 am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb 
* commit '20af1c57de9651b93a35b67418263b88bc83f3e4':
  Correct font size for notifications & control panel.
 2011-01-28 15:05:07 -08:00
Justin Ho
20af1c57de Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Brian Muramatsu
4f92dd2a4d am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb 
* commit '910be3e855738eab783f2e280b76dcef90a841ec':
  Fix TextUtils#commaEllipsize
 2011-01-28 14:55:31 -08:00
Eric Fischer
0e77f6dfcb Import revised translations. DO NOT MERGE 
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
 2011-01-28 14:54:54 -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
Romain Guy
489c8960b6 am 571a2c97: am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 
* commit '571a2c971b9691f3ace247bf2110efccc782f3ba':
  Prevent crash when detaching a SurfaceView. Bug #3400461
 2011-01-28 14:22:29 -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
Jamie Gennis
3e669cca86 am a461269d: am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 
* commit 'a461269d458b29f1e44ba66f6f4ef6b711013705':
  Quiet the SurfaceFlingerClient dequeueBuffer error.
 2011-01-28 14:18:09 -08:00
Romain Guy
b0c939adfa Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Jamie Gennis
a461269d45 am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 
* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
  Quiet the SurfaceFlingerClient dequeueBuffer error.
 2011-01-28 14:15:44 -08:00
Jamie Gennis
2a8f8d57d2 Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 2011-01-28 14:12:57 -08:00
Gilles Debunne
d38c4a6dca am 06cedc1c: am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb 
* commit '06cedc1c4a0587389bb1eb360df62b1ec1964bd1':
  Fix for TextView's error popup behavior when using soft keyboard.
 2011-01-28 14:12:38 -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
Adam Powell
9cbf8d3028 am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 
* commit '406de58e48378bca9ea7e75c61039d243ea81855':
  Fix bug 3399992 - Make ActionBar menu text styleable
 2011-01-28 14:03:31 -08:00
Adam Powell
406de58e48 am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
  Fix bug 3399992 - Make ActionBar menu text styleable
 2011-01-28 14:01:06 -08:00
Adam Powell
6b2fda9f4b Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
bafa3a31f5 am d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb 
* commit 'd6874a105ee584b1dc60aae2f2af7c78ee875114':
  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:45:51 -08:00
Joe Onorato
8b16ebd0e8 am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 
* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
 2011-01-28 13:45:42 -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
Adam Powell
55f3af27ed Fix bug 3399992 - Make ActionBar menu text styleable 
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
 2011-01-28 13:42:04 -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
Daniel Sandler
ca05585f04 Correct font size for notifications & control panel. 
Bug: 3388577
Bug: 3394785
 2011-01-28 16:07:25 -05:00
Dianne Hackborn
f2a8b3c450 am 8691b724: am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 
* commit '8691b7243d40d5ef0ab94b8d5f204635d36bf1c4':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
 2011-01-28 12:48:15 -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
Xavier Ducrohet
2c06d4e786 am 412e6f7e: am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 
* commit '412e6f7e294aa56a2c4532155cde6fa9963dbbf0':
  LayoutLib: Update with the new resource map APIs.
 2011-01-28 12:44:01 -08:00
Xavier Ducrohet
412e6f7e29 am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 
* commit '361d614822fcda456ba80f166e5d97447adb7e79':
  LayoutLib: Update with the new resource map APIs.
 2011-01-28 12:40:30 -08:00
Xavier Ducrohet
361d614822 Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 2011-01-28 12:38:40 -08:00
Daniel Sandler
e42d0dd741 am 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 
* commit '9bd1d3204f4048b902d0fdf0ea0809f29eddeafd':
  Fix overlapping app icon & info in notifications with large icons.
 2011-01-28 12:22:38 -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
Daniel Sandler
9bd1d3204f am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 
* commit 'f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
  Fix overlapping app icon & info in notifications with large icons.
 2011-01-28 12:20:11 -08:00
Daniel Sandler
f0ca959b02 Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 2011-01-28 12:18:11 -08:00
Jamie Gennis
6913062faa Quiet the SurfaceFlingerClient dequeueBuffer error. 
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one.  Currently, an error
is returned in that case, and this change just prevents that error from
being logged.  In the future this will be fixed to not return an error
in that case.

Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
 2011-01-28 12:08:18 -08:00
Daniel Sandler
db173394aa Fix overlapping app icon & info in notifications with large icons. 
Bug: 3398728
Bug: 3394785
Change-Id: I50f065d482815612b2b187f1bc4360489d7455e6
 2011-01-28 14:55:42 -05:00
Andreas Huber
f51c35e45f am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb 
* commit '35a1f771759459fc6c9b355d548c5b97cd50e110':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
 2011-01-28 11:53:50 -08:00
Andreas Huber
35a1f77175 am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb 
* commit '79c4648597dab2b7786c8f067896ab66abe190de':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
 2011-01-28 11:51:16 -08:00
Andreas Huber
79c4648597 Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb 2011-01-28 11:49:03 -08:00
Xavier Ducrohet
35ea7cd4c0 LayoutLib: Update with the new resource map APIs. 
Change-Id: I30d83c2bb4569513f4f5e22670cffe938706f105
 2011-01-28 11:44:21 -08:00
Romain Guy
01d5edc49a Prevent crash when detaching a SurfaceView. 
Bug #3400461

Change-Id: I837d9d47b12bc5a8798b6dbb720de43b7539c3bc
 2011-01-28 11:28:53 -08:00
Daniel Sandler
b50f64f5c5 am bcb14a20: am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb 
* commit 'bcb14a203561c3782ebd6515650cc7001318efb6':
  Allow taps to once again penetrate the darkness.
 2011-01-28 11:26:05 -08:00
Daniel Sandler
bcb14a2035 am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb 
* commit '2ded7ef444d4e089e0ce4874c791f19ec198fc36':
  Allow taps to once again penetrate the darkness.
 2011-01-28 11:23:47 -08:00