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

120798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Haldean Brown
f3f1c7a334 am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit '63d161e4ae57b61b33d77f4ea3c91279a6acb807':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:47:06 +00:00
Will Haldean Brown
63d161e4ae Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 2014-03-25 21:39:17 +00:00
Justin Koh
c635ef999b am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'ec5b6e8726a215ff912bbbf872b8bdf600a74e1e':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:13:53 +00:00
Justin Koh
ec5b6e8726 Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 2014-03-25 21:01:56 +00:00
Ricardo Cervera
917a83da70 am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '7133208a816dc3eedf9c45309112c05f7d9136e0':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:43:23 +00:00
Will Haldean Brown
61e0965678 Remove all but two micro themes, light and dark. 
Bug: 13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
 2014-03-25 13:38:33 -07:00
Ricardo Cervera
7133208a81 am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '89a41db09a0a4935a111777e12c01a40765d20be':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:36:42 +00:00
Chris Craik
7e55b35a60 am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e':
  Solve three memory leaks related to PatchCache
 2014-03-25 20:28:00 +00:00
Ricardo Cervera
89a41db09a am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '825280d2ac85cef7ec1f096b02006c26dba0374a':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:27:51 +00:00
Ricardo Cervera
825280d2ac Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 2014-03-25 20:22:59 +00:00
Chris Craik
4118480aab am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb':
  Solve three memory leaks related to PatchCache
 2014-03-25 13:21:01 -07:00
Justin Koh
f1596064d3 Add RobotoCondensed-Light to build. 
Add RobotoCondensed-Light to build so that apps don't all need to include their
own copy.
Bug: 13087110

Change-Id: I55973a4ba2a68858b79271519a0ecc9c54f6b31e
 2014-03-25 13:19:02 -07:00
Eino-Ville Talvala
63d61640d4 am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '55a1e78fbd38955a5f5d0f09a517b392cc8199cb':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:15:52 +00:00
Craig Mautner
c89283c586 am d0955068: am 74e19f57: 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 'd09550687360544f0659e37f393ba2f5b04b55a4':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:15:49 +00:00
Scott Main
1cf8117aa2 am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit 'dc18ce783fa10466d15ec74be38d38555c4750c6':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:15:46 +00:00
Craig Mautner
4f61f6d4bb am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit 'e187441b9b9b760a21da7c80b49c61f85eaec8e4':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 20:15:43 +00:00
Chris Craik
80470cdf6c Merge "Solve three memory leaks related to PatchCache" 2014-03-25 20:11:33 +00:00
Eino-Ville Talvala
55a1e78fbd am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:11:12 +00:00
Craig Mautner
d095506873 am 74e19f57: 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 '74e19f572a598ce907661ed2f5127319f8d7c635':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:11:08 +00:00
Scott Main
dc18ce783f am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '78373edb8d5838276c73a418b07f735ad20286dc':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:11:03 +00:00
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