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

126495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
564a0cd87c Merge "Continue refactoring of MediaFocusControl" 2014-03-26 17:36:59 +00:00
Chris Wren
4c31999282 Merge "always clear the HeadsUpDecayTimer" 2014-03-26 17:09:55 +00:00
Chris Wren
7fd2a3bf6a always clear the HeadsUpDecayTimer 
for non-clearable heads up notifications,
a decay timer may be left in the queue

Bug: 13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
 2014-03-26 13:09:18 -04:00
Nick Kralevich
c76275377c am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '32cc40a9b57750451a6489e01526dc6a14d72bff':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 16:36:33 +00:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 15:55:41 +00:00
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes. 
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-03-26 09:19:12 -04:00
Dan Sandler
59f0258a27 Categorize some system notifications. 
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
 2014-03-26 01:31:04 +00:00
Adam Lesinski
a200414ffe Merge "Use new build var to depend on an APKs resources" 2014-03-26 00:41:28 +00:00
Craig Mautner
d7dc6f77f7 am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit '16744ac3f7b030f1192d298132256ac06eaff205':
  Defer removal of activity until animation complete.
 2014-03-26 00:32:14 +00:00
Svetoslav
8a2b46d535 Merge "Wrong constant used for undefined accessibility window id." 2014-03-26 00:28:27 +00:00
Svetoslav
cbcc9695f0 Wrong constant used for undefined accessibility window id. 
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
 2014-03-25 17:27:37 -07:00
Craig Mautner
16744ac3f7 am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
  Defer removal of activity until animation complete.
 2014-03-26 00:26:03 +00: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
da5c13eb8a am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit '57be13035205a32707df94ceaf055ffa334d2852':
  fix broken link
 2014-03-26 00:12:20 +00:00
Scott Main
57be130352 am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'c3bcce5907553c6f006fc2c0ac74383f01647827':
  fix broken link
 2014-03-26 00:05:17 +00:00
Adam Lesinski
b0569b98d5 Use new build var to depend on an APKs resources 
Some other projects use LOCAL_APK_LIBRARIES and don't yet
work with the new shared library changes.

Change-Id: Ibb54bc1b5e3eb1252cf5b4e45249b089d25854ac
 2014-03-25 17:04:56 -07: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
e535c1e587 am 8460e8ff: am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '8460e8ffa3c697c63fb092528648351508bc7c7f':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:20:14 +00:00
Ricardo Cervera
8460e8ffa3 am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '287b5bb241d8ba167836523e3e4fd177534ae928':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:14:37 +00:00
Ricardo Cervera
287b5bb241 am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '64906b52423a9829e7af9ff512fb18b0947f9920':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:08:12 +00: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
a22b385777 am 7e98cee6: am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit '7e98cee6c2e9770dab9133d7aad6e5affd4a7c40':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:58:01 +00:00
Will Haldean Brown
7e98cee6c2 am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit 'f3f1c7a3346aa82ab045d037c2ec6e45c5fc2678':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:51:55 +00:00
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
9a8afb1c3a am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'd89929db3e010eaa68d8f7c8227f95cdd4fb5179':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:36:39 +00:00
Ricardo Cervera
1f88794f41 am 805f3fae: am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '805f3fae25677d04d71470948d1ad855d5d6d9eb':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 21:23:57 +00:00
Chris Craik
e08f166955 am 72cf99ab: am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '72cf99abdb6648f9346b72e0ef6d4da3c4dc9d17':
  Solve three memory leaks related to PatchCache
 2014-03-25 21:23:52 +00:00
Eino-Ville Talvala
42004973cd am 1559e0b6: (-s ours) am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1559e0b6a76e089cddc56708ccb177b0d37cc1ba':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 21:23:44 +00:00
Craig Mautner
c9ef91a72f am f07788b9: am c89283c5: 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 'f07788b997e31578da202525ac72d4eec6fe4176':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 21:23:41 +00:00
Scott Main
9a07a66ba9 am 1adb8947: am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '1adb8947dae240a11d96450971b3b84d745339c3':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 21:23:32 +00:00
Craig Mautner
578899571b am ac21f995: am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit 'ac21f995e8982c1dd83ba9f6313cf1481f4faf5e':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 21:23:29 +00:00
Kenny Root
6ab41d71eb am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit '266de3efcd4b57ba3b301d87ff0fb692090d9a95':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 21:23:18 +00:00
Craig Mautner
4abb86c05d am 732d5aaa: am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '732d5aaa3bf50c06f3a7f306221613f4625610f3':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 21:23:15 +00:00
Baligh Uddin
561ffd248f am fe74cdcc: (-s ours) am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918':
  Import translations. DO NOT MERGE
 2014-03-25 21:22:44 +00:00
Craig Mautner
62143f2f17 am 1df9bc5c: am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev 
* commit '1df9bc5c1d47a09b08d49287d81832e18674bece':
  Move task to top in window manager.
 2014-03-25 21:21:45 +00:00
Adam Lesinski
2471abec78 am e77786d5: am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev 
* commit 'e77786d51f574ca7bbb45df136f92fc7c7d06ffe':
  Fix issue with early service start
 2014-03-25 21:21:21 +00:00
Baligh Uddin
0deb8ad6b2 am fbb3ae6c: (-s ours) am cdd07216: (-s ours) am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7':
  Import translations. DO NOT MERGE
 2014-03-25 21:21:18 +00:00
Narayan Kamath
a0eeb5e172 am 2c595209: am 163b8655: am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit '2c595209f99103be6572bafe4ad7faf52f81bbcb':
  Fix scaleNinePatch.
 2014-03-25 21:20:21 +00:00
Scott Main
86a01f7c56 am f71eebdb: am 686f041e: am 77dc3c00: am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit 'f71eebdb22a251538a81c1fce8d5bf80ce5d7619':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 21:20:06 +00:00
Justin Koh
d89929db3e am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'c635ef999bae6d48654a9a6b442b6d5d42ff38dd':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:20:01 +00:00
Ricardo Cervera
ba8169ac46 am ba6bbb01: am addeab5c: am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4. 
* commit 'ba6bbb01d4f8b60c3c124797700122b717a2a5c4':
  docs: Added release notes for Google APIs System Image v4.
 2014-03-25 21:19:53 +00:00
Matthew Williams
0826bcc95d am 2c672973: (-s ours) am 4bcf922a: am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule. 
* commit '2c6729735290140959a7102afea3320d257d1f42':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
 2014-03-25 21:19:49 +00:00
Scott Main
33f1338fbc am b8a79fce: am 941eabc2: am e9b50e75: am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions 
* commit 'b8a79fcef37dba36733dc25064b40f706a13fc7a':
  update wear homepage with layout fixes and replace GIFs with smaller versions
 2014-03-25 21:19:42 +00:00