Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,904 Commits 3 Branches 0 Tags
876677ef2d04545593fd4cd7bb8539fa15e3dc09
Commit Graph

10193 Commits

Author SHA1 Message Date
Rich Slogar
389d5ac6ac am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit '353232ecee06d1828d8628c4e3917e3b428485aa':
  docs: renderscript using gradle settings
 2015-05-12 17:48:30 +00:00
Rich Slogar
353232ecee am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'b97afd418558fbe5cf37a17302a84a9d907490e6':
  docs: renderscript using gradle settings
 2015-05-12 17:36:17 +00:00
Rich Slogar
b97afd4185 am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'a27dd186b265b58eae490d4e19ec11268ea54f12':
  docs: renderscript using gradle settings
 2015-05-12 17:20:10 +00:00
Rich Slogar
a27dd186b2 am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'e78f136b1dbe11dc98c5699da24df49fd9dae795':
  docs: renderscript using gradle settings
 2015-05-12 17:05:40 +00:00
Rich Slogar
e78f136b1d Merge "docs: renderscript using gradle settings" into lmp-docs 2015-05-12 16:54:39 +00:00
Joe Fernandez
57881dcfb1 am f3c04204: am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 
* commit 'f3c042045f70b74d700c3d96429f45b93606e56b':
  docs: studio 1.2.1.1 updates
 2015-05-12 04:24:53 +00:00
Joe Fernandez
f3c042045f am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 
* commit '13e39e3fd28544ff13639938455a8b7d593b835b':
  docs: studio 1.2.1.1 updates
 2015-05-12 04:09:42 +00:00
Jeff Hao
3da32f77fb am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs. 
* commit 'b1e9430a9d653937ae9ee2ae9c3e60860b30ba4d':
  Fix prototype for startMethodTracingSampling in profiling docs.
 2015-05-12 04:09:38 +00:00
Joe Fernandez
13e39e3fd2 am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 
* commit 'c1e973477d635e08ab656bba3dbaf73927feaae8':
  docs: studio 1.2.1.1 updates
 2015-05-12 04:00:31 +00:00
Jeff Hao
b1e9430a9d am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs. 
* commit 'c5ced5d354678c6eaefbfab11035b4f05361264a':
  Fix prototype for startMethodTracingSampling in profiling docs.
 2015-05-12 04:00:24 +00:00
Joe Fernandez
c1e973477d Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 2015-05-12 03:51:24 +00:00
Jeff Hao
c5ced5d354 Fix prototype for startMethodTracingSampling in profiling docs. 
Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c
(cherry picked from commit 3755c3d8bc)
 2015-05-12 00:43:47 +00:00
Jeff Hao
3755c3d8bc Fix prototype for startMethodTracingSampling in profiling docs. 
Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c
 2015-05-11 17:33:49 -07:00
Jeff Hao
70159dfeb6 am 55c4816f: am cf6a3b91: Update ddms and profiling docs to include sample profiling. 
* commit '55c4816fb2aa8ea54231de6dbcb4fa22642bb75e':
  Update ddms and profiling docs to include sample profiling.
 2015-05-11 23:57:32 +00:00
Rich Slogar
2d488eb8c7 docs: studio 1.2.1.1 updates 
Change-Id: I0e0f25873b06a135e6fd68f1a2aad463d204c4e5
 2015-05-11 16:54:55 -07:00
Jeff Hao
55c4816fb2 am cf6a3b91: Update ddms and profiling docs to include sample profiling. 
* commit 'cf6a3b915c2984ae573b27a46dd732811d642427':
  Update ddms and profiling docs to include sample profiling.
 2015-05-11 23:44:15 +00:00
Jeff Hao
a4492b418d Merge "Update ddms and profiling docs to include sample profiling." into mnc-dev 2015-05-11 22:30:58 +00:00
Jeff Hao
cf6a3b915c Update ddms and profiling docs to include sample profiling. 
Bug: 5866094

Change-Id: Ib97990ee2fc823416b3f41856b815d4092818f98
 2015-05-11 22:30:20 +00:00
Quddus Chong
b98e07129c am ce4408a1: am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented un 
* commit 'ce4408a104300006a3296bfd2f2aad9c0f2fd9dc':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
 2015-05-11 22:16:36 +00:00
Quddus Chong
ce4408a104 am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to r 
* commit 'a75778438fde2e7ec5322a69930ff49ded48f4c1':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
 2015-05-11 22:02:42 +00:00
Quddus Chong
a75778438f am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a devic 
* commit 'd43ec6380ce04f4c0830cd35d1dbd7b3050799d4':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
 2015-05-11 21:51:50 +00:00
Quddus Chong
d43ec6380c am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator 
* commit '174dc3ba607965cf1dd0578f83ce373fa74d0f65':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
 2015-05-11 21:38:46 +00:00
Quddus Chong
174dc3ba60 Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator." into lmp-docs 2015-05-11 21:23:43 +00:00
Quddus Chong
4bc762a919 docs: Added training docs for Android unit testing tools and APIs. 
This training covers techniques for running unit tests on local
machines, using mock objects in local unit tests, and building
instrumented unit tests to run on a device or emulator.

Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d
 2015-05-11 14:09:25 -07:00
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
Jeff Hao
ad06fbb848 Update ddms and profiling docs to include sample profiling. 
Bug: 5866094

Change-Id: Ib97990ee2fc823416b3f41856b815d4092818f98
 2015-05-08 17:35:24 -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