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

10167 Commits

Author SHA1 Message Date
Dirk Dougherty
a2e26b4953 am d3b2d050: am 674b1fcb: Doc change: Update cards and landing contents. 
* commit 'd3b2d0502dd30039789f2a2b6380a4344fdc865e':
  Doc change: Update cards and landing contents.
 2015-05-09 04:49:22 +00:00
Dirk Dougherty
d3b2d0502d am 674b1fcb: Doc change: Update cards and landing contents. 
* commit '674b1fcbaae2142666a6fb8eea4595fa8c64e406':
  Doc change: Update cards and landing contents.
 2015-05-09 04:37:37 +00:00
Dirk Dougherty
674b1fcbaa Doc change: Update cards and landing contents. 
Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
 2015-05-08 20:48:34 -07:00
Alex Klyubin
b954ecda09 Merge "Switch to KeyguardManager.isDeviceSecure." into mnc-dev 2015-05-08 18:06:35 +00:00
Dirk Dougherty
e1a1d2e85a am 4e19b9a0: am 27e82e7b: Merge "Doc change: remove design content that has moved to material spec." into mnc-preview-docs 
* commit '4e19b9a01e1a9b37aa4b2b02ff2baac764824a33':
  Doc change: remove design content that has moved to material spec.
 2015-05-08 17:19:50 +00:00
Joe Fernandez
8605d635ff am 259a73b5: am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript reference framer page 
* commit '259a73b560b3acbd653167b2617810920a6f4b22':
  docs: remove obsolete renderscript reference framer page
 2015-05-08 17:19:40 +00:00
Alex Klyubin
68c33d52bf Switch to KeyguardManager.isDeviceSecure. 
isKeyguardSecure also returns true when SIM PIN is required. We don't
care about that because entering SIM PIN does not unlock keys
requiring user authentication. isDeviceSecure returns true only if
secure lock screen is set up, which is exactly what we want.

Bug: 18088752
Change-Id: I47b21f3351f55c11e8e9bcfd7654762973dd9271
 2015-05-08 08:47:19 -07:00
Dirk Dougherty
4e19b9a01e am 27e82e7b: Merge "Doc change: remove design content that has moved to material spec." into mnc-preview-docs 
* commit '27e82e7b3824b886ae1179c58c2f7073831d6c6a':
  Doc change: remove design content that has moved to material spec.
 2015-05-08 03:46:49 +00:00
Dirk Dougherty
27e82e7b38 Merge "Doc change: remove design content that has moved to material spec." into mnc-preview-docs 2015-05-08 03:35:57 +00:00
Joe Fernandez
259a73b560 am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript reference framer page 
* commit 'b2152a43ea8b44772fab5d29dea436f2a4ddc89b':
  docs: remove obsolete renderscript reference framer page
 2015-05-07 22:42:50 +00:00
Joe Fernandez
b2152a43ea am 1dc26b8c: docs: remove obsolete renderscript reference framer page 
* commit '1dc26b8c1eaa6b5aa288cecf9202e77217507fd3':
  docs: remove obsolete renderscript reference framer page
 2015-05-07 22:29:55 +00:00
Joe Fernandez
1dc26b8c1e docs: remove obsolete renderscript reference framer page 
Change-Id: I9ec7ad462584d2e2b7132b1ddbf9306c9df83b10
 2015-05-07 15:14:31 -07:00
Joe Fernandez
38de061b8b am b53420d0: am e7866887: docs: M Preview landing page 
* commit 'b53420d02def4277cf5b8a04da289b4291a9f24a':
  docs: M Preview landing page
 2015-05-07 06:42:05 +00:00
Joe Fernandez
b53420d02d am e7866887: docs: M Preview landing page 
* commit 'e78668876ed0dfc25fac604b5048509f72d92c53':
  docs: M Preview landing page
 2015-05-07 06:29:57 +00:00
Joe Fernandez
e78668876e docs: M Preview landing page 
Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
 2015-05-06 23:19:23 -07:00
Dirk Dougherty
cd7e7dc423 Doc change: remove design content that has moved to material spec. 
Change-Id: I335e3386633ae1e95891980b225885f5fed219b0
 2015-05-05 22:27:48 -07:00
Rich Slogar
f1ca577728 am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs 
* commit '34e0f6401e66df33ec71df7f76196bbe0eca3183':
  docs: gradle multidex update
 2015-05-06 01:24:46 +00:00
Rich Slogar
8bbbbd2afd am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs 
* commit 'b462da9e3d554deb9ba5b8ca58d5d66797fb54d5':
  docs: overview link to release notes
 2015-05-06 01:24:41 +00:00
Rich Slogar
c98d6ae334 am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs 
* commit '48ea7762295cdf3e2bd61dafd55422a0d6bee5e6':
  docs: translation editor update
 2015-05-06 01:24:33 +00:00
Rich Slogar
5464b5ca62 am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs 
* commit 'cc4a29807e679a1691a949c117f540867304acc7':
  docs: memory monitor duplicate paragraph
 2015-05-06 01:24:27 +00:00
Rich Slogar
34e0f6401e am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs 
* commit '84a67c7db75edc192a8975637c99c9a917796ff1':
  docs: gradle multidex update
 2015-05-06 01:14:31 +00:00
Rich Slogar
b462da9e3d am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs 
* commit 'f0ea8f9f1e1ede23f954cade5ee4a84e92d28943':
  docs: overview link to release notes
 2015-05-06 01:14:26 +00:00
Rich Slogar
48ea776229 am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs 
* commit '7e33aa4843edbc037659023cff98dd44ac90d44c':
  docs: translation editor update
 2015-05-06 01:14:21 +00:00
Rich Slogar
cc4a29807e am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs 
* commit 'ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83':
  docs: memory monitor duplicate paragraph
 2015-05-06 01:14:08 +00:00
Rich Slogar
138ab38141 am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs 
* commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b':
  docs: providing resources link
 2015-05-06 01:13:28 +00:00
Rich Slogar
84a67c7db7 am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs 
* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed':
  docs: gradle multidex update
 2015-05-06 01:00:16 +00:00
Rich Slogar
f0ea8f9f1e am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs 
* commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed':
  docs: overview link to release notes
 2015-05-06 01:00:12 +00:00
Rich Slogar
7e33aa4843 am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs 
* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5':
  docs: translation editor update
 2015-05-06 01:00:08 +00:00
Rich Slogar
ffef3b7676 am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs 
* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
  docs: memory monitor duplicate paragraph
 2015-05-06 01:00:04 +00:00
Rich Slogar
e12c404a07 am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs 
* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
  docs: providing resources link
 2015-05-06 00:58:49 +00:00
Rich Slogar
35d7cd40bb am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs 
* commit 'd0551feed28614dad957a09998522b25392ce621':
  docs: providing resources link
 2015-05-06 00:50:57 +00:00
Rich Slogar
1b5f692d85 am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs 
* commit '9b4d57e1dc480f375dc26a77333ff4705f760bb8':
  docs: gradle multidex update
 2015-05-06 00:44:58 +00:00
Rich Slogar
f77d64dca7 am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs 
* commit '2f14c38ffb5da66ab58551a1ccd273dfb602babf':
  docs: overview link to release notes
 2015-05-06 00:44:53 +00:00
Rich Slogar
96d00bb64c am 37ca7773: Merge "docs: translation editor update" into lmp-docs 
* commit '37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2':
  docs: translation editor update
 2015-05-06 00:44:48 +00:00
Rich Slogar
39b51b4968 am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs 
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
  docs: memory monitor duplicate paragraph
 2015-05-06 00:44:42 +00:00
Jean-Luc Brouillet
afa81ed0b1 am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation. 
* commit '79f12bb648aa8a4f71e2c64c5c6354e2261e3257':
  docs: Overhaul of the RenderScript reference documentation.
 2015-05-05 23:58:55 +00:00
Rich Slogar
d0551feed2 Merge "docs: providing resources link" into lmp-mr1-ub-docs 2015-05-05 23:44:34 +00:00
Rich Slogar
9b4d57e1dc Merge "docs: gradle multidex update" into lmp-docs 2015-05-05 23:42:23 +00:00
Jean-Luc Brouillet
79f12bb648 am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation. 
* commit 'd967fcbee77b2872cb5ae6b05aaabbbc764f806b':
  docs: Overhaul of the RenderScript reference documentation.
 2015-05-05 23:39:28 +00:00
Rich Slogar
2f14c38ffb Merge "docs: overview link to release notes" into lmp-docs 2015-05-05 23:38:50 +00:00
Rich Slogar
37ca7773a5 Merge "docs: translation editor update" into lmp-docs 2015-05-05 23:38:18 +00:00
Rich Slogar
2febf6e0a5 Merge "docs: memory monitor duplicate paragraph" into lmp-docs 2015-05-05 23:37:52 +00:00
Jean-Luc Brouillet
d967fcbee7 am e9f17cda: docs: Overhaul of the RenderScript reference documentation. 
* commit 'e9f17cda80ae60818f43b4ed724436c8b88fd0db':
  docs: Overhaul of the RenderScript reference documentation.
 2015-05-05 23:27:04 +00:00
Jean-Luc Brouillet
e9f17cda80 docs: Overhaul of the RenderScript reference documentation. 
cherry-pick from CL: https://android-review.googlesource.com/148241

This CL replaces the Doxygen generated documentation by one that's created
by our internal tool found in framework/rs/api.  The big advantages:

- Can handle overloaded functions.  Doxygen could not and RenderScript has many.
- Can have version information.
- Can match the look of the Java documentation.
- Cleaner look and no leaking of internal paths.

This CL also include changes introduced by the L release which was missing
previously.

Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f
 2015-05-05 15:20:50 -07:00
Dirk Dougherty
08e474ca24 am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs 
* commit '08c72b91bedefbebe0547646544cd875c1062af0':
  Doc change: merge landing page and header/footer designs.
 2015-05-05 02:46:40 +00:00
Dirk Dougherty
08c72b91be am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs 
* commit 'ecfed34d3e71bfceae11493b8441a051e803ec05':
  Doc change: merge landing page and header/footer designs.
 2015-05-05 02:34:51 +00:00
Dirk Dougherty
ecfed34d3e Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs 2015-05-05 02:27:47 +00:00
Rich Slogar
703b5f895d am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs 
* commit '2f6261534b0916714715ffa9e2800716dd900eb8':
  docs: Update Eclipse migrate procedure
 2015-05-05 01:48:06 +00:00
Andrew Solovay
3e51aa3981 am 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs 
* commit '168bbcef02603b35b9fad53d923310b9a80acb5b':
  Docs: New swipe-to-refresh training guide.
 2015-05-05 01:48:00 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00