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

126419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Selim Cinek
92a87e3026 am 50cd7c39: am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping 
* commit '50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
  Fixed wallpaper bug where wrong size was taken when cropping
 2014-03-25 21:18:45 +00:00
Gabriel Peal
f53d1a0197 Merge "resolved conflicts for merge of c1edfc2c to master" 2014-03-25 20:59:05 +00:00
Zhijun He
aaad0047a6 Merge "Camera2: Add partial flash state" 2014-03-25 20:54:55 +00:00
Gabriel Peal
68fe6e7f0e resolved conflicts for merge of c1edfc2c to master 
Change-Id: I95d690e5f0895c1dbfd911f345703f0f562be447
 2014-03-25 13:49:51 -07:00
Zhijun He
8dda7273db Camera2: Add partial flash state 
Bug 13637334

Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
 2014-03-25 13:49:30 -07:00
Adam Lesinski
7f3b7116b7 Merge "Shared library resource support" 2014-03-25 20:49:08 +00:00
Gabriel Peal
db0dca826d resolved conflicts for merge of c1edfc2c to master 
attempt 2

Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
 2014-03-25 13:39:55 -07: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
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
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
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
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
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