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

120073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
3d093ea69a am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit 'e59a26650afbc664aeda08f7e69c2d135631c34d':
  docs: Added Android Studio build system doc.
 2014-03-26 18:16:35 +00:00
Ricardo Cervera
e59a26650a am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit '1b59f291573deb4c1d6f60035637a3c49e671ab4':
  docs: Added Android Studio build system doc.
 2014-03-26 18:11:33 +00:00
Baligh Uddin
b79bceeb6f Import translations. DO NOT MERGE 
Change-Id: I4da32094b7c44f5042c276dc7dd2aef2132ffca9
Auto-generated-cl: translation import
 2014-03-26 11:08:06 -07:00
Ricardo Cervera
1b59f29157 Merge "docs: Added Android Studio build system doc." into klp-docs 2014-03-26 18:06:51 +00:00
Baligh Uddin
9ac253ffed Import translations. DO NOT MERGE 
Change-Id: I9e363ec3f4253e6496f1c6cc6019bb807388e7f4
Auto-generated-cl: translation import
 2014-03-26 11:06:02 -07:00
Craig Mautner
d1e32cd320 Merge "Defer removal of activity until animation complete." into klp-modular-dev 2014-03-26 00:21:56 +00:00
Scott Main
c3bcce5907 am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit '01e68cabb523440382ef3a02a512f8ce3b8af287':
  fix broken link
 2014-03-25 23:58:10 +00:00
Scott Main
01e68cabb5 am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'ad52a4ce9964508288316bfc5fb52833bf70b6a5':
  fix broken link
 2014-03-25 23:53:24 +00:00
Craig Mautner
79e6578b6c Defer removal of activity until animation complete. 
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
 2014-03-25 16:48:47 -07:00
Scott Main
ad52a4ce99 Merge "fix broken link" into klp-docs 2014-03-25 23:47:00 +00:00
Scott Main
a8c29e19e4 fix broken link 
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
 2014-03-25 16:45:40 -07:00
Ricardo Cervera
3cd141c59f docs: Added Android Studio build system doc. 
Added a document explaning how to use the new build system
in Android Studio.

Change-Id: I45ae1902820c1aaaf4c5810ee683b4d7a5221f16
 2014-03-25 15:49:36 -07:00
Ricardo Cervera
64906b5242 am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '2564614c2ea1927b1bc26f6ac8a39e236c93e922':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:01:37 +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
Ricardo Cervera
2564614c2e am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '39aed838f505314fe6f1947e39de79de2f84ba40':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 21:13:54 +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
39aed838f5 docs: Amend SDK release notes for 22.6.2 
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
 2014-03-25 13:50:55 -07: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
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
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
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
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
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
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
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
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