ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
29,247 Commits 2 Branches 0 Tags 54 MiB
36373fcf15
Commit Graph

29247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
ab655cf35f Merge "Protected surface API" 2011-01-28 15:18:43 -08:00
Eric Fischer
5c353aeff8 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
d2e2cdb567 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
a7442c9587 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:16 -08:00
Justin Ho
fa91187f48 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
e46b080102 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
31db9b8551 Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Brian Muramatsu
17e76c082e am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb 
* commit '910be3e855738eab783f2e280b76dcef90a841ec':
  Fix TextUtils#commaEllipsize
 2011-01-28 14:55:31 -08:00
Brian Muramatsu
1a86374dc3 am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb 
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
  Fix TextUtils#commaEllipsize
 2011-01-28 14:53:07 -08:00
Brian Muramatsu
12ef5792f0 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Romain Guy
56919f3fb6 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
719eda08be 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
Eric Fischer
c9a4eb08a0 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:19:36 -08:00
Jamie Gennis
378a3f8001 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
3845b92378 Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Jamie Gennis
e8c431b142 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
155c93ad47 Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 2011-01-28 14:12:57 -08:00
Gilles Debunne
962114fb9d 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
Eric Fischer
bb3356d637 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Gilles Debunne
3546e78bd8 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
2948bb3f5f Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb 2011-01-28 14:07:12 -08:00
Adam Powell
dba4728fea 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
304d99871f 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
7791f904da Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
7695710253 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
d03e56ed9a 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
d24a7df9f0 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
0a72c43a42 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
ee37f4d420 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
311e33ddd1 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
Dianne Hackborn
e03591372e 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
065b683e26 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
e40389171f Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 2011-01-28 12:44:52 -08:00
Xavier Ducrohet
215ac7eee1 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
57be3f1d31 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
2b63b8306b Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 2011-01-28 12:38:40 -08:00
Daniel Sandler
8b08d5cdec 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
Daniel Sandler
ea28d411fd 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
ea0c499624 Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 2011-01-28 12:18:11 -08:00
Jamie Gennis
749172269a 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
Dirk Dougherty
438a2420b0 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-28 12:00:51 -08:00
Dirk Dougherty
11057a96fd Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Andreas Huber
1c09d72f55 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
60c2d783a4 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
b7ee5074dd Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb 2011-01-28 11:49:03 -08:00
Daniel Sandler
0e75802730 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
d01f5e3121 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
Daniel Sandler
fab00f6920 Merge "Allow taps to once again penetrate the darkness." into honeycomb 2011-01-28 11:21:27 -08:00
Gilles Debunne
fed298d6c5 am 3b1561a1: am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb 
* commit '3b1561a18c466c23e9c5a3c3297bfc97e881c829':
  Fix for an IOOBoundsException in Paint.
 2011-01-28 11:04:36 -08:00
Gilles Debunne
7d1b9518b0 am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb 
* commit 'e1df07fc5a88da0242a6ade054423ec464c5318f':
  Fix for an IOOBoundsException in Paint.
 2011-01-28 11:02:21 -08:00