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

126687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
72cf99abdb am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '7e55b35a603fe64e8db2c6050a1b778baaccd920':
  Solve three memory leaks related to PatchCache
 2014-03-25 20:36:15 +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
Eino-Ville Talvala
1559e0b6a7 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 '63d61640d41b85b32ca7287235ca638731555b63':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:21:33 +00:00
Craig Mautner
f07788b997 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 'c89283c5863855fadd8853e524e36e19aaaf142a':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:21:30 +00:00
Scott Main
1adb8947da am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '1cf8117aa22c5ef16c5513fd1c6d428233df4833':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:21:27 +00:00
Craig Mautner
ac21f995e8 am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit '4f61f6d4bbd24fe1802d8aa81e1c32e57fbbbd78':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 20:21:24 +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
Jean-Michel Trivi
223fd631f6 Continue refactoring of MediaFocusControl 
Close external access to MediaFocusControl event handler.

Change-Id: Id82718399806c246b5ac2cb3b49189286dcd8e89
 2014-03-25 12:43:58 -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
Gabriel Peal
5e44cadfd6 Merge "resolved conflicts for merge of c1edfc2c to master" 2014-03-25 19:22:41 +00:00
Gabriel Peal
8b5f2b080d resolved conflicts for merge of c1edfc2c to master 
Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
 2014-03-25 12:21:43 -07:00
Kenny Root
266de3efcd am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit 'dd3e6399098c46e0d38c810213fd956bed305c62':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 19:17:44 +00:00
Craig Mautner
732d5aaa3b am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '12b575bd5a557a485e80df49ef05a402e8c53f6a':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 19:17:41 +00:00
Adam Lesinski
de898ff429 Shared library resource support 
Shared libraries can now export resources for applications
to use.

Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.

Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.

Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.

At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.

See /tests/SharedLibrary/ for examples of a shared library and its
client.

Bug:12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
 2014-03-25 12:09:56 -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
fe74cdcc60 am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0a4bd7c90c836a8d3d857753c72d83b35cefa5f3':
  Import translations. DO NOT MERGE
 2014-03-25 19:09:16 +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
05f79758cd Merge "Import translations. DO NOT MERGE" 2014-03-25 18:56:41 +00:00
Baligh Uddin
f318306232 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 18:56:38 +00:00
Baligh Uddin
449616f9ae Merge "Import translations. DO NOT MERGE" 2014-03-25 18:56:32 +00:00
Baligh Uddin
3984068f0a Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-25 18:56:30 +00:00
Baligh Uddin
da94c0efe9 Merge "Import translations. DO NOT MERGE" 2014-03-25 18:56:24 +00:00
Baligh Uddin
20de38b9ab Merge "Import translations. DO NOT MERGE" 2014-03-25 18:56:23 +00:00
Baligh Uddin
52528c5ef0 Merge "Import translations. DO NOT MERGE" 2014-03-25 18:56:18 +00:00
Baligh Uddin
d894e15c13 Merge "Import translations. DO NOT MERGE" 2014-03-25 18:52:33 +00:00
Baligh Uddin
fca9992c4b Merge "Import translations. DO NOT MERGE" 2014-03-25 18:52:31 +00:00
Baligh Uddin
71d718b749 Merge "Import translations. DO NOT MERGE" 2014-03-25 18:52:29 +00:00
Gabriel Peal
2d72d00093 Merge "resolved conflicts for merge of 74fb97de to master" 2014-03-25 18:32:23 +00:00
Craig Mautner
1df9bc5c1d am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev 
* commit 'd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b':
  Move task to top in window manager.
 2014-03-25 18:19:24 +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
Chris Craik
c21929c710 Merge "Fix doc build" 2014-03-25 18:08:30 +00:00
Gabriel Peal
f1e1e77143 resolved conflicts for merge of 74fb97de to master 
Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
 2014-03-25 11:08:19 -07:00
Chris Craik
f975823773 Fix doc build 
Change-Id: I18627229be3e8e242e469af83e7e5ae580b03707
 2014-03-25 11:06:58 -07:00