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

126465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
415e6f8ed4 Merge "Fix issue with early service start" into klp-modular-dev 2014-03-25 17:22:11 +00:00
John Reck
5bf11bb98f Add missing null check 
Bug: 13635394
 mDisplayListData can be null, make sure
 to check for that before trying to walk through the
 children list in updateProperties

Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
 2014-03-25 10:22:09 -07:00
Baligh Uddin
cdd0721656 am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '27f67d25c8c77e609eb523b98fd7276e0ae8e3e0':
  Import translations. DO NOT MERGE
 2014-03-25 17:19:47 +00:00
Kenny Root
c1d863e7a4 am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 10:19:27 -07:00
Craig Mautner
9bbd2f977b am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '2cacc619d62f58ee8a9d0fcfac942c6d5faf7031':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 10:19:24 -07:00
Tim Kilbourn
803d91b2b2 Fix NPE when inflating GradientDrawables. 
Change-Id: If624d6efac61dabe6009ee4368ad7b119e1d4dcd
 2014-03-25 10:13:02 -07:00
Kenny Root
77ceb5e8f1 Merge "Use X509ExtendedTrustManager and not Conscrypt" 2014-03-25 17:06:55 +00:00
Koji Fukui
9bc5f2f457 Don't wait for finishing animation when second display is disconnected 
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.

With this fix windows are immediately removed without waiting for
animation when second display is disconnected.

(Cherry picked from aosp 39f7068ed903f747d6885117dc1bac69f626ae91)

Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e

Fixes bug: b/13632129
 2014-03-25 17:04:27 +00:00
Craig Mautner
41bb0637ca am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:04:07 -07:00
Baligh Uddin
27f67d25c8 am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '29526ccad0b67dd93eae034fa8cc80341cab69db':
  Import translations. DO NOT MERGE
 2014-03-25 17:02:17 +00:00
Craig Mautner
2cacc619d6 Merge "Don't wait for finishing animation when second display is disconnected" 2014-03-25 17:01:28 +00:00
Craig Mautner
76e85eec84 am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '3bc9971d707839f2d26e601082d654242295002d':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:58:17 -07:00
Craig Mautner
ca903d3809 am 81e094d7: Merge "Move task to top in window manager." into klp-dev 
* commit '81e094d76b9220e335edc24599919f8cd0f5d317':
  Move task to top in window manager.
 2014-03-25 16:55:03 +00:00
Baligh Uddin
29526ccad0 am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8907801268b62dfadaf8c9f73d60ffaea6dbf904':
  Import translations. DO NOT MERGE
 2014-03-25 16:55:01 +00:00
Craig Mautner
3bc9971d70 am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:52:28 -07:00
Craig Mautner
81e094d76b Merge "Move task to top in window manager." into klp-dev 2014-03-25 16:48:38 +00:00
Craig Mautner
95d6e32bc3 am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:48:27 -07:00
Baligh Uddin
8907801268 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-25 16:47:24 +00:00
Craig Mautner
86f9a93e20 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 2014-03-25 16:43:41 +00:00
Narayan Kamath
2c595209f9 am 163b8655: am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit '163b865564fdb4d491c54ee04efb17af80a18689':
  Fix scaleNinePatch.
 2014-03-25 14:38:25 +00:00
Narayan Kamath
163b865564 am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9':
  Fix scaleNinePatch.
 2014-03-25 14:32:10 +00:00
Narayan Kamath
ea96d791c7 am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit '5f0d44f69768a39b0bcd9d1d072ce3606a1ca1ed':
  Fix scaleNinePatch.
 2014-03-25 07:27:11 -07:00
Narayan Kamath
5f0d44f697 Merge "Fix scaleNinePatch." 2014-03-25 13:56:51 +00:00
Przemyslaw Szczepaniak
0a8596dc0c Merge "Documentation update for TextToSpeech#getFeatures" 2014-03-25 10:40:19 +00:00
Scott Main
f71eebdb22 am 686f041e: am 77dc3c00: am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit '686f041ea484abe23e5d70fcc141de687f38d1df':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 10:24:02 +00:00
Scott Main
686f041ea4 am 77dc3c00: am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit '77dc3c00cb102fe91634aa63edf8fbec4a5ad03f':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 10:18:28 +00:00
Ricardo Cervera
ba6bbb01d4 am addeab5c: am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4. 
* commit 'addeab5c0459223be9a1059b18b3f2e34188328a':
  docs: Added release notes for Google APIs System Image v4.
 2014-03-25 10:14:40 +00:00
Matthew Williams
2c67297352 am 4bcf922a: am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule. 
* commit '4bcf922a55beb0513f7c9cc18c57e6f3d2cd729e':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
 2014-03-25 10:14:37 +00:00
Scott Main
b8a79fcef3 am 941eabc2: am e9b50e75: am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions 
* commit '941eabc24819901f46f15cc1929408574240f64b':
  update wear homepage with layout fixes and replace GIFs with smaller versions
 2014-03-25 10:14:34 +00:00
Scott Main
77dc3c00cb am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit '27fa561f56bac8867e462fc793fecaf3449c5158':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 10:11:55 +00:00
Scott Main
27fa561f56 am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit '52f449fd5a999aea77fa8df3628af7845d0cfcef':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 10:06:36 +00:00
Ricardo Cervera
addeab5c04 am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4. 
* commit 'bd48af2cd753025828bb5e76194da0f910b99ba3':
  docs: Added release notes for Google APIs System Image v4.
 2014-03-25 10:04:59 +00:00
Matthew Williams
4bcf922a55 am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule. 
* commit 'c798e4f5497c39a3c6c14b120cffdee1122a9212':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
 2014-03-25 10:04:56 +00:00
Scott Main
941eabc248 am e9b50e75: am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions 
* commit 'e9b50e75a050e75161aa316b0c73bdab500ca14d':
  update wear homepage with layout fixes and replace GIFs with smaller versions
 2014-03-25 10:04:51 +00:00
Ricardo Cervera
bd48af2cd7 am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4. 
* commit 'cd64a9ba96bed7841e01fa125241d0410fc7b214':
  docs: Added release notes for Google APIs System Image v4.
 2014-03-25 09:57:43 +00:00
Matthew Williams
c798e4f549 am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule. 
* commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
 2014-03-25 09:57:36 +00:00
Scott Main
e9b50e75a0 am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions 
* commit '9d8184e790b49238fa17cf24bf744596ce1ee195':
  update wear homepage with layout fixes and replace GIFs with smaller versions
 2014-03-25 09:57:09 +00:00
Yohann Roussel
30494b70e9 Merge "Add one test application for multidex." 2014-03-25 09:38:43 +00:00
Scott Main
52f449fd5a fix size and behavior of video thumbnail when flash not available 
Change-Id: Ifc5eae0f9e42cc16b0daab9e715ff885388cf91c
 2014-03-24 23:23:22 -07:00
Selim Cinek
50cd7c39bb am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping 
* commit 'f7805dd77aab98bcf2153bdd5e22f1c44beed137':
  Fixed wallpaper bug where wrong size was taken when cropping
 2014-03-25 04:00:26 +00:00
Gabriel Peal
c1edfc2c67 am 4668f1ed: am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit '4668f1ed0d9b4fbb321d25803192d53c31d1ec3d':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-25 04:00:23 +00:00
John Reck
bfb07a0377 Move where updateProperties is called 
Change-Id: I27da448996019094c44487ce28c5689d098d6535
 2014-03-24 21:00:18 -07:00
Selim Cinek
f7805dd77a am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping 
* commit '7290b56b51119070c549d88d3946d61e34f62ba3':
  Fixed wallpaper bug where wrong size was taken when cropping
 2014-03-25 03:54:14 +00:00
Gabriel Peal
4668f1ed0d am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit '8ee4491dc80943429cd79d0c7b87c28056067a58':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-25 03:54:11 +00:00
Selim Cinek
7290b56b51 am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping 
* commit '8ae8689d165299bd0bbd0e04bff987dad352c8f5':
  Fixed wallpaper bug where wrong size was taken when cropping
 2014-03-25 03:46:27 +00:00
Gabriel Peal
8ee4491dc8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers. 
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-25 03:46:17 +00:00
Alan Viverette
eebf17ad20 Merge "Unhide touch feedback drawable and wrapper" 2014-03-25 02:55:27 +00:00
Alan Viverette
840dede901 Unhide touch feedback drawable and wrapper 
Change-Id: I98926d4adfb6e8c6130b31c8f4534a1a382d0f3b
 2014-03-24 19:54:34 -07:00
Koji Fukui
39f7068ed9 Don't wait for finishing animation when second display is disconnected 
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.

With this fix windows are immediately removed without waiting for
animation when second display is disconnected.

Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
 2014-03-25 11:25:32 +09:00
Michael Wright
5da8ca9189 Merge "Respect ACTION_CANCEL for joystick fallbacks" 2014-03-25 01:48:06 +00:00