Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
a2ae6c9dbf Merge "docs: New "implementing app restrictions" doc" into lmp-docs 2015-02-25 01:01:56 +00:00
Filip Gruszczynski
23958c6e2f Force translucency from windowIsTranslucent on SwipeDismissLayout. 
Bug: 18799741

Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
 2015-02-24 16:59:45 -08:00
Chris Craik
a9ad0fc793 am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection
 2015-02-25 00:26:51 +00:00
Andrew Solovay
79cb98c6ce docs: New "implementing app restrictions" doc 
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
 2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4 am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection
 2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8 Explain behavior of boundless ripple projection 
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
 2015-02-25 00:12:38 +00:00
Sanket Padawe
ea4713d6e5 Changing usage of carrier name field of SubInfoRecord 
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
 2015-02-24 13:15:15 -08:00
Jason Monk
de3260b5bf Keyguard: Use plmn/spn broadcast when no SIMs 
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
 2015-02-24 10:13:47 -05:00
Narayan Kamath
287c53f4a8 am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '76507a64b530c757dc284f1f4d0807ffbfd9a701':
  Track removal of refcounts from FileMap.
 2015-02-24 13:04:43 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
 2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
 2015-02-24 00:46:48 +00:00
Joe LaPenna
c0c395162f Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 2015-02-24 00:37:15 +00:00
Junda Liu
985f52cde5 Fix incorrect condition for sub id check. 
Bug: b/19277299
Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
 2015-02-23 16:06:51 -08:00
Chad Brubaker
f271fa33f1 am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:53:07 +00:00
Chad Brubaker
3576ca1f9b am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API
 2015-02-23 22:53:01 +00:00
Chad Brubaker
cdc70256f4 am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:45:11 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
 2015-02-23 22:45:01 +00:00
Chad Brubaker
f3c117ca0d Merge "Add new IKeystoreService methods to KeyStore" 2015-02-23 22:20:59 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
e6a461341c Add new IKeystoreService methods to KeyStore 
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
 2015-02-23 14:12:44 -08:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API 
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
 2015-02-23 14:12:37 -08:00
Deepanshu Gupta
68501b87d2 Better error msg for StateList/Hexadecimal Color. 
Throw a better error message when resolving a hexadecimal color value
but the user gave a Color State List. The two are easy to confuse since
the only way to distinguish between the two is to look at the
definition.

Bug: http://b.android.com/70110
Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
 2015-02-23 12:00:38 -08:00
Rich Slogar
6de010f600 docs: remove exploring sdk link 
b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
 2015-02-23 11:37:36 -08:00
Deepanshu Gupta
01d5286f38 am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '8f022fd323063f9cebb481be650db40cf5e486f3':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:29:31 +00:00
Deepanshu Gupta
8f022fd323 am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:22:31 +00:00
Deepanshu Gupta
5ed4fc9efd am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:15:57 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:03:29 +00:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
Dan Albert
10caf0390d Update autogenerated gl functions. 
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
 2015-02-23 10:47:19 -08:00
David Friedman
6248cdd588 am 84e40b1f: am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '84e40b1f338eba0a352a6bf3a0f2801c21e17d59':
  Fixes several typos.
 2015-02-23 18:39:53 +00:00
David Friedman
96824427e9 am 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:39:47 +00:00
David Friedman
84e40b1f33 am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48':
  Fixes several typos.
 2015-02-23 18:33:08 +00:00
David Friedman
2c6894685d am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'fcbc842878df5fbe3d8a62add407bb512179e28a':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:33:04 +00:00
David Friedman
d77380b856 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.
 2015-02-23 18:26:10 +00:00
David Friedman
fcbc842878 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:26:06 +00:00
David Friedman
3570268bcf am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.
 2015-02-23 18:20:37 +00:00
David Friedman
f066c2358d am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:20:32 +00:00
David Friedman
09e9076ddf am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.
 2015-02-23 18:13:36 +00:00
David Friedman
18c8a35fa4 am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
 2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts. 
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
 2015-02-23 17:26:12 +00:00
Geoff Mendal
c37feed094 am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '87809139d223ae1e5629590ba7611b9b1da63cbb':
  Import translations. DO NOT MERGE
 2015-02-23 16:47:35 +00:00