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

126461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jean-Michel Trivi
cd60e3a57c Merge "Begin refactor of MediaFocusControl" 2014-03-25 17:52:01 +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
Jean-Michel Trivi
de23f56360 Begin refactor of MediaFocusControl 
Extract class that handles each entry in the remote control stack
  and move it to another file, MediaController.java.
Rename RemoteControlStackEntry to MediaController as each instance
  will not just encapsulate information about the corresponding
  (if any) RemoteControlClient.
This is just a CL for the renaming and extraction into a new file
  of existing code. Obvious required changes are labelled "FIXME".

Change-Id: Ifbdac1d70e4d279ab175eef03e9d792d44873c51
 2014-03-25 10:47:58 -07: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
John Reck
bcad68ad80 Merge "Move where updateProperties is called" 2014-03-25 17:46:18 +00: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
Adam Lesinski
e77786d51f am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev 
* commit '99d607844da2b100afe3d134c1c006f4cc5b35b1':
  Fix issue with early service start
 2014-03-25 17:32:26 +00: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
Baligh Uddin
fbb3ae6ca6 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 'cdd07216563faccad1c439eee23ca9d4b64c0ac7':
  Import translations. DO NOT MERGE
 2014-03-25 17:27:22 +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
John Reck
632717e609 Merge "Add missing null check" 2014-03-25 17:25:33 +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
John Reck
5bf11bb98f Add missing null check 
Bug: 13635394
 mDisplayListData can be null, make sure
 to check for that before trying to walk through the
 children list in updateProperties

Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
 2014-03-25 10:22:09 -07: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