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

120983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
e187441b9b Merge commit '703169a3' into manualmerge 2014-03-25 13:08:01 -07:00
Ricardo Cervera
60bec60b9c docs: Added release notes for Android SDK 22.6.2 
Change-Id: I6c8abb75b10cf4bc983f67954c169c7ac9ab9b1c
 2014-03-25 12:34:32 -07:00
Kenny Root
dd3e639909 am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 19:09:27 +00:00
Craig Mautner
12b575bd5a am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '9bbd2f977ba4d6c4642f96673f937a677ff0beb2':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 19:09:24 +00:00
Baligh Uddin
0a4bd7c90c am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f318306232c2cb3095eecd72d1fa06059bf35f8e':
  Import translations. DO NOT MERGE
 2014-03-25 19:02:05 +00:00
Eino-Ville Talvala
1555cec2e5 am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit 'ecad0541a6e90b98ad96456c4e6992121ee8a789':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 19:01:45 +00:00
Eino-Ville Talvala
ecad0541a6 Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 2014-03-25 18:57:08 +00:00
Baligh Uddin
f318306232 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 18:56:38 +00:00
Craig Mautner
d7bf82d6a4 am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev 
* commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954':
  Move task to top in window manager.
 2014-03-25 18:14:15 +00:00
Craig Mautner
f32b22e9c7 resolved conflicts for merge of ca903d38 to klp-modular-dev 
Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041
 2014-03-25 11:05:08 -07:00
Craig Mautner
74e19f572a am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '6f955df8e632aabeef312d488b7ebbad25d8a2d8':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 17:58:54 +00:00
Scott Main
78373edb8d am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '837a4885978dd29cda4b8309051284af5a45f41c':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 17:54:35 +00:00
Craig Mautner
6f955df8e6 am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 17:48:38 +00:00
Scott Main
837a488597 fix links and add note that adb forward must be repeated 
bug: 13474515
bug: 13576843

Change-Id: I808efb5fa1fae2280b4447ad0278ea1d4428b5b6
 2014-03-25 10:46:37 -07:00
Craig Mautner
550b44d188 am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit 'f4644189f665f221e8033587811e58f12e2ccc86':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:42:38 -07:00
Craig Mautner
f4644189f6 am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:36:04 -07:00
Craig Mautner
4cf6286c3c am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '02c7ba73e8733def289535b6d13dc6a504a0443f':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:29:48 -07:00
Craig Mautner
703169a382 am 2b2395f3: Merge "Don\'t wait for finishing animation when second display is disconnected" into klp-dev 
* commit '2b2395f39a7a3b271f7d1072acec64db1554694e':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 17:29:10 +00:00
Adam Lesinski
99d607844d am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev 
* commit '415e6f8ed46a70e6ae50e05cda56356dae31718c':
  Fix issue with early service start
 2014-03-25 17:26:05 +00:00
Craig Mautner
02c7ba73e8 am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '41bb0637ca430808ab40a0300467ea58ae0a05c3':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:22:56 -07:00
Craig Mautner
2b2395f39a Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev 2014-03-25 17:22:55 +00:00
Adam Lesinski
415e6f8ed4 Merge "Fix issue with early service start" into klp-modular-dev 2014-03-25 17:22:11 +00: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
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
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
Ashok Bhat
136c08a7d3 Cast CallMethod's size_t parameters to jint 
This will avoid problems caused by automatic type
promotion of parameters when passed to a variadic function.

Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-03-25 10:39:13 +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
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