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

9963 Commits

Author SHA1 Message Date
Luan Nguyen
5c1e306502 am 2da31b1e: am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs 
* commit '2da31b1ef75f239ee33fea4592cbf0159a0af8b4':
  docs: Add Channel API summary for Wear.
 2015-04-21 15:59:24 +00:00
Luan Nguyen
886e8e1137 am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs 
* commit '2fdd83a97a0dd3de36264928ff42dcc0a098018f':
  docs: Add Channel API summary for Wear.
 2015-04-21 15:35:41 +00:00
Luan Nguyen
4aebbfbb9b Merge "docs: Add Channel API summary for Wear." into lmp-docs 2015-04-21 14:53:04 +00:00
Quddus Chong
d0ac1d176d am 3b6883b8: am 8cde8f7f: am b1c838e0: am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402 
* commit '3b6883b8054ffad5b3cc845552d09bfe673cb889':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
 2015-04-20 23:53:12 +00:00
Quddus Chong
8cde8f7f1e am b1c838e0: am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402 
* commit 'b1c838e03bf9f828e59deed57a7e7445cc2ad9e8':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
 2015-04-20 23:29:30 +00:00
Quddus Chong
900831f303 docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. 
bug: 20304402

Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
 2015-04-20 14:01:24 -07:00
Ryosuke Matsuuchi
2314b47b11 am b84f4cfe: am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit 'b84f4cfe5d09ea55900bd8ea3b68970a998a244f':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 05:50:47 +00:00
Ryosuke Matsuuchi
fea08ccdff am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 
* commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-19 00:55:05 +00:00
Dirk Dougherty
2142bedd72 am 93e73639: am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '93e73639bf0e1cea63c0c0eee24f4be2aba5fb0f':
  Doc change: distribute landing page.
 2015-04-19 00:17:09 +00:00
Ryosuke Matsuuchi
0d2f280310 Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs 2015-04-19 00:15:12 +00:00
Dirk Dougherty
308cd16022 am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs 
* commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3':
  Doc change: distribute landing page.
 2015-04-18 23:54:58 +00:00
Dirk Dougherty
ff233af75f Merge "Doc change: distribute landing page." into lmp-docs 2015-04-18 23:11:42 +00:00
Dirk Dougherty
1792ec17b8 Doc change: distribute landing page. 
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
 2015-04-18 16:00:23 -07:00
Rich Slogar
3e1cfe106a am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
  docs: studio remove gradle tasks dialog
 2015-04-17 18:01:05 +00:00
Rich Slogar
56a38d46ac am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '58befba6ac88b4216cac43f97a456d1119dcb972':
  docs: hierarchyviewer updates
 2015-04-17 18:00:53 +00:00
Rich Slogar
a9315dc16c am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs 
* commit 'c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
  docs: studio remove gradle tasks dialog
 2015-04-17 17:37:51 +00:00
Rich Slogar
124c40252d am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs 
* commit '1252b4b8694a69150b79ecfd801ed62c6929edf3':
  docs: hierarchyviewer updates
 2015-04-17 17:37:45 +00:00
Rich Slogar
1fcc6bd854 Merge "docs: studio remove gradle tasks dialog" into lmp-docs 2015-04-17 16:53:34 +00:00
Rich Slogar
efe861a4a7 Merge "docs: hierarchyviewer updates" into lmp-docs 2015-04-17 16:52:45 +00:00
Luan Nguyen
b5890f9b45 docs: Add Channel API summary for Wear. 
bug: 20089257
Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
 2015-04-17 09:12:16 -07:00
Ryosuke Matsuuchi
19a7b54619 doc: Add Korean version of DAC/distribute/ page. 
Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
 2015-04-17 10:57:31 +09:00
Alex Klyubin
35075a0765 Merge "Document usesCleartextTraffic app-level attribute." 2015-04-16 22:28:06 +00:00
Brian Carlstrom
49cb2775a9 am 81d0aabc: am 40955edf: am 14a982aa: Merge "Document hprof-conv -z" 
* commit '81d0aabcb5af11f8695793dbfac893d17688970e':
  Document hprof-conv -z
 2015-04-16 17:53:43 +00:00
Brian Carlstrom
40955edf9d am 14a982aa: Merge "Document hprof-conv -z" 
* commit '14a982aa7a38fa89c916c252996632d401b1d043':
  Document hprof-conv -z
 2015-04-16 17:31:34 +00:00
Brian Carlstrom
d7931acf4a Document hprof-conv -z 
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
 2015-04-16 10:06:58 -07:00
Rich Slogar
f9f81b49d0 docs: hierarchyviewer updates 
b/19955159

Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
 2015-04-15 15:48:35 -07:00
Alex Klyubin
e35cefbf23 Document usesCleartextTraffic app-level attribute. 
This updates the documentation of the application element of
AndroidManifest.xml to mention the new android:usesCleartextTraffic
attribute.

This also updates the Javadoc of
android.security.NetworkSecurityPolicy and ApplicationInfo to match.

Bug: 19215516
Change-Id: I5c221b56addae8988b4db51994d18ae379d0fbe3
 2015-04-15 14:37:05 -07:00
Rich Slogar
caa15d49f9 docs: studio remove gradle tasks dialog 
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
 2015-04-15 10:30:18 -07:00
Joe Fernandez
3abfa03e37 am 808042e6: am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '808042e6c2244b24acb30c0f33439c730fa0acd7':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 02:16:55 +00:00
Joe Fernandez
e635f9b5e0 am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 
* commit '726466c22517a1dc4d549edfd32fc5447794d29e':
  docs: Add Cross-References to Material Design Spec
 2015-04-15 00:55:08 +00:00
Joe Fernandez
af5f200038 Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs 2015-04-14 19:55:36 +00:00
Joe Fernandez
49ca2de88a docs: Add Cross-References to Material Design Spec 
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
 2015-04-14 12:53:12 -07:00
Dirk Dougherty
8cc578c37b am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '38544901e6aa6934b032303be314a92dcde662f3':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:13:35 +00:00
Dirk Dougherty
f2a57c69d4 am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'cda895c53d22496001ae59fae36f751cf04af3ed':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:54:32 +00:00
Dirk Dougherty
00f857c5a1 Merge "Doc change: add new pages for Designed for Families." into lmp-docs 2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
smain@google.com
3c273bbb91 am f46c8f5b: am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'f46c8f5bfcb30d7f9d8b91e6f193d7ab574e05e9':
  initial batch of NDK files for skeleton site build
 2015-04-14 03:10:51 +00:00
Rich Slogar
b8a699c846 am 7fd2be12: am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '7fd2be12d11a33c2ad622d8b49e74d6ba7a12be5':
  docs: systrace update
 2015-04-14 03:10:38 +00:00
Rich Slogar
6f92b72298 am c29f30cb: am 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit 'c29f30cbf1ee6bec3b2ead374aba71002db6faaa':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 03:10:28 +00:00
Mathieu Chartier
7a55461453 am 7e39ae4f: am 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit '7e39ae4fd683f6fd056eae754fde1579fb5a19b6':
  Update "Investigating your RAM usage" for ART
 2015-04-14 03:10:16 +00:00
smain@google.com
c9393a5d70 am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:44:14 +00:00
Rich Slogar
f828c92c5e am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '6b9e30fe959e6c67687c52eeb152de623368695d':
  docs: systrace update
 2015-04-14 02:43:56 +00:00
Rich Slogar
9e58689da6 am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9761530b3fbff0f2d686c4a0f48efa02c159a309':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:43:49 +00:00
Mathieu Chartier
32b675b9f5 am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'd4bcbcfa08502d6feafbe39e9dcb16a38e61f892':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:43:39 +00:00
smain@google.com
4301dd0458 am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build
 2015-04-13 20:44:52 +00:00
Mathieu Chartier
473989c35d Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 2015-04-13 20:44:18 +00:00
smain@google.com
d60649c541 Merge "initial batch of NDK files for skeleton site build" into lmp-docs 2015-04-13 20:32:38 +00:00
smain@google.com
0178321af6 initial batch of NDK files for skeleton site build 
Change-Id: I00152e817377c072f529940743499a3b6d91f80d
 2015-04-13 12:51:19 -07:00
Alex Klyubin
9b3e005a4e Unhide the new AndroidKeyStore API. 
Bug: 18088752
Change-Id: I93f87cbb1cd04a4a2e34f3d544d678c92cf052ee
 2015-04-13 11:34:04 -07:00
Rich Slogar
3e664c3bda am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update
 2015-04-13 18:30:38 +00:00