Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,860 Commits 3 Branches 0 Tags
2dd48ab8bd96c2ab3edfd2cdaa9dc52fa25d09cd
Commit Graph

12864 Commits

Author SHA1 Message Date
Dirk Dougherty
2dd48ab8bd Fix stray char in metadata file. am: 4852cb74fc am: aa723591cf am: 4a4fda6416 am: 3ff6495ca6 am: 6a16725106 
am: 5783f30958

* commit '5783f3095836231abf1d3e10cd528e0355a291d2':
  Fix stray char in metadata file.

Change-Id: I527879b4999d36653269acd16cd76673435bee35
 2016-05-03 17:31:50 +00:00
Dirk Dougherty
3ff6495ca6 Fix stray char in metadata file. am: 4852cb74fc am: aa723591cf 
am: 4a4fda6416

* commit '4a4fda64166d47328b23c8c89da3600dc7792cc6':
  Fix stray char in metadata file.

Change-Id: Idd76ac02c6fc3387c9c679cd43bf71595aed7327
 2016-05-03 17:24:19 +00:00
Dirk Dougherty
4a4fda6416 Fix stray char in metadata file. am: 4852cb74fc 
am: aa723591cf

* commit 'aa723591cf8d6e9dc351c06043c48858710f2b4d':
  Fix stray char in metadata file.

Change-Id: I9ff9158240d14496829399420175efec04e89f6b
 2016-05-03 17:21:54 +00:00
Dirk Dougherty
4852cb74fc Fix stray char in metadata file. 
Change-Id: I4a11125f2540fbc3204850e87ca74c11e63754c5
 2016-05-03 10:07:27 -07:00
Dirk Dougherty
c6f2c4051d Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 am: 145ca75e17 am: 42e9230547 am: c9b3b13f4a am: 956bb81834 
am: 01071e4638

* commit '01071e463872badcf0f0f73edd0ef88a411db8bf':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: I164ab33dfd70bf687c0788f64362eb6c20e26b56
 2016-05-03 17:01:43 +00:00
Joe Fernandez
9306199b35 docs: May 2016 Dashboard update am: ae5c8a9f4a am: b46a079a16 am: 250376bfad am: cf69f3887b am: b8e46d6ef5 
am: d81d7a2895

* commit 'd81d7a28951aa24217973b6815051c68250a58cd':
  docs: May 2016 Dashboard update

Change-Id: I266e081f99394d8f40a2ef9f61b188c79811b151
 2016-05-03 17:01:37 +00:00
Dirk Dougherty
c9b3b13f4a Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 am: 145ca75e17 
am: 42e9230547

* commit '42e9230547579444171f5595928886cfda88746f':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: Ic1594415171b5e94e06d201496349baf3e708b27
 2016-05-03 16:51:57 +00:00
Joe Fernandez
cf69f3887b docs: May 2016 Dashboard update am: ae5c8a9f4a am: b46a079a16 
am: 250376bfad

* commit '250376bfadff5f34292f44625539e90884a2d9aa':
  docs: May 2016 Dashboard update

Change-Id: I46534a2eba5b80225d0fa721b0c1c61f180f3c1b
 2016-05-03 16:51:52 +00:00
Dirk Dougherty
42e9230547 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs am: 1516bf2cd4 
am: 145ca75e17

* commit '145ca75e17473232ca99ddef0582af2b43a54c64':
  Add metadata for Android Studio card and point the landing/primary collection at it.

Change-Id: I59cccb47a38628feb3d05b533fe6e464825578cc
 2016-05-03 16:46:46 +00:00
Joe Fernandez
250376bfad docs: May 2016 Dashboard update am: ae5c8a9f4a 
am: b46a079a16

* commit 'b46a079a16fd10c5926ac5ce9489d1d10b752e14':
  docs: May 2016 Dashboard update

Change-Id: I0162a357306dcd7dd273efc8c96ba9bb106e9b9e
 2016-05-03 16:46:43 +00:00
Dirk Dougherty
1516bf2cd4 Merge "Add metadata for Android Studio card and point the landing/primary collection at it." into mnc-mr-docs 2016-05-03 16:39:20 +00:00
Dirk Dougherty
5276b8048b Add metadata for Android Studio card and point the landing/primary collection at it. 
Change-Id: Ibc2581e96265ff54cf669082ea13ae3a68bf340a
 2016-05-03 09:35:19 -07:00
Joe Fernandez
ae5c8a9f4a docs: May 2016 Dashboard update 
Change-Id: I74831ac0edb3b093665aca267a9ead1d72f4ec04
 2016-05-03 09:26:25 -07:00
Jaewan Kim
c0c053d69f Merge "Fix documentation for drawable resource" 2016-05-03 05:14:35 +00:00
Dirk Dougherty
2393f4449f resolve merge conflicts of 3481659 to nyc-dev 
Change-Id: Iea83aebfd5e8a7fa0dcb0c459588048d0f7ce47e
 2016-05-02 21:03:13 -07:00
Dirk Dougherty
3481659b1f Remove adk docs and channels. am: 756a593c1b 
am: 6de0bf839f

* commit '6de0bf839fae7d48b9e1ec0fe229eef56cf4e074':
  Remove adk docs and channels.

Change-Id: I9d1002ba0d5f985bf184f689e2529bc221daa6aa
 2016-05-03 02:39:18 +00:00
Dirk Dougherty
756a593c1b Remove adk docs and channels. 
Change-Id: I6fa367d806062a126bd1efc67772400bfca66956
 2016-05-02 19:30:18 -07:00
Eric Schmidt
c5553c338a Merge "Merge "docs: Added virtual files to preview doc" into mnc-docs am: 15eb965696" into mnc-mr-docs am: 4ccb1bc19b am: 785787f983 
am: b7b6aaaee5

* commit 'b7b6aaaee5bc1b3a1fabbea699a43e24ec90cb80':
  docs: Added virtual files to preview doc

Change-Id: I420bacbc6d80b43815938e1fc1389e7b80637267
 2016-05-03 00:26:33 +00:00
Andrew Solovay
d62f5db1f5 Merge "docs: Fixing redirects for DAC-on-devsite" into mnc-mr-docs am: b234feadab am: 176c75f378 
am: 91088b1652

* commit '91088b1652e905f967f553f7e259fe4ec0107312':
  docs: Fixing redirects for DAC-on-devsite

Change-Id: Ia796b0b58972bab7f00da15617928965f3c74be4
 2016-05-03 00:26:27 +00:00
Eric Schmidt
b7b6aaaee5 Merge "Merge "docs: Added virtual files to preview doc" into mnc-docs am: 15eb965696" into mnc-mr-docs am: 4ccb1bc19b 
am: 785787f983

* commit '785787f9837774e245c6bd03a89115730cfa0ff8':
  docs: Added virtual files to preview doc

Change-Id: I470b704f67fd290c16ef6af7d81f02b84bff34dc
 2016-05-03 00:23:48 +00:00
Andrew Solovay
91088b1652 Merge "docs: Fixing redirects for DAC-on-devsite" into mnc-mr-docs am: b234feadab 
am: 176c75f378

* commit '176c75f378942b611c3cfb46bf5162d5c0eeba8d':
  docs: Fixing redirects for DAC-on-devsite

Change-Id: Ia57f2ac610e6a6fa5bf8fbe68616df9b8268c8b8
 2016-05-03 00:23:44 +00:00
Android Build Merger (Role)
4ccb1bc19b Merge "Merge "docs: Added virtual files to preview doc" into mnc-docs am: 15eb965696" into mnc-mr-docs 2016-05-03 00:09:43 +00:00
Eric Schmidt
06feab3abc Merge "docs: Added virtual files to preview doc" into mnc-docs 
am: 15eb965696

* commit '15eb965696806c5f18d2521bf9ad6065b1400a48':
  docs: Added virtual files to preview doc

Change-Id: Iff00a19c8e88f3e32be238ba60edb5da957d90c2
 2016-05-03 00:09:18 +00:00
TreeHugger Robot
b234feadab Merge "docs: Fixing redirects for DAC-on-devsite" into mnc-mr-docs 2016-05-03 00:05:51 +00:00
Eric Schmidt
15eb965696 Merge "docs: Added virtual files to preview doc" into mnc-docs 2016-05-02 23:59:59 +00:00
Andrew Solovay
2748f89096 docs: Fixing redirects for DAC-on-devsite 
On Devsite, the redirect parser doesn't understand regular
expressions, which breaks ~ 10% of our existing redirects; fixing
them now. Also fixing a few other redirect-related bugs while I've got
the hood open.

See first comment for doc stage location.

bug: 28447522
bug: 28467616

Change-Id: I5f315fd54cb9353a56674b5aac4dcd53875263c9
 2016-05-02 16:49:21 -07:00
Eric Schmidt
186fada46b docs: Added virtual files to preview doc 
Bug: 28297470
Change-Id: I393ba4083ce5d2ca43a815e61e962761b08a8194
 2016-05-02 22:13:01 +00:00
smain@google.com
0f3e895661 resolve merge conflicts of 7829131 to nyc-dev 
Change-Id: I9e995ea0b6d7a8758ba37f171240b53182a31fed
 2016-05-02 14:09:52 -07:00
Cheryl Potter
b843741489 docs: Polish Android Monitor pages 
b/26279420

(cherry picked from commit 5fc7099e1e)

Change-Id: Ie24e6fbb1f82e84bf382b440f4eb533ad1a473a5
 2016-05-02 13:41:27 -07:00
smain@google.com
782913190b Delete all of the tools/ directory, but save the adk files by moving them up. Redirects for all the tools/ files are already in Piper\'s site-android/en/_redirects.yaml file. The new adk redirects are in this cl: https://critique.corp.google.com/#review/121302608 am: 41f7ff9150 
am: c10ce54761

* commit 'c10ce54761f4bb1a887561af15a51625c902049b':
  Delete all of the tools/ directory, but save the adk files by moving them up. Redirects for all the tools/ files are already in Piper's site-android/en/_redirects.yaml file. The new adk redirects are in this cl: https://critique.corp.google.com/#review/121302608

Change-Id: Ia8bc55aab35cdfadd7b5cecf435e68b4b3b7ba60
 2016-05-02 20:38:41 +00:00
smain@google.com
41f7ff9150 Delete all of the tools/ directory, but save the adk files by moving them up. 
Redirects for all the tools/ files are already in Piper's site-android/en/_redirects.yaml file.
The new adk redirects are in this cl: https://critique.corp.google.com/#review/121302608

Change-Id: Iaec963429274d617572d4a23549de1b561932c44
 2016-05-02 13:14:47 -07:00
smain@google.com
796fb64aba Merge "Delete everything from /sdk directory that is now in /studio. Redirects are in https://critique.corp.google.com/#review/121297240" into mnc-mr-docs am: 84bf8073a8 am: 34561c73a2 
am: c1a9241a37

* commit 'c1a9241a373d9f3594e284486ad2544c143aff3f':
  Delete everything from /sdk directory that is now in /studio. Redirects are in https://critique.corp.google.com/#review/121297240

Change-Id: I8021d782d403e5a281280436a9de779ddd03d2b9
 2016-05-02 20:01:28 +00:00
Scott Main
c1a9241a37 Merge "Delete everything from /sdk directory that is now in /studio. Redirects are in https://critique.corp.google.com/#review/121297240" into mnc-mr-docs am: 84bf8073a8 
am: 34561c73a2

* commit '34561c73a2136d552121b0aec0c78b307eebac52':
  Delete everything from /sdk directory that is now in /studio. Redirects are in https://critique.corp.google.com/#review/121297240

Change-Id: Iddf4ed155928dcbd897d31fff7bbff4cb0b04157
 2016-05-02 19:56:31 +00:00
Scott Main
84bf8073a8 Merge "Delete everything from /sdk directory that is now in /studio. Redirects are in https://critique.corp.google.com/#review/121297240" into mnc-mr-docs 2016-05-02 19:38:32 +00:00
smain@google.com
bf36507aec Delete everything from /sdk directory that is now in /studio. 
Redirects are in https://critique.corp.google.com/#review/121297240

Change-Id: If746be8a3dc7208f59cb2a3b971316517e889fe6
 2016-05-02 12:35:56 -07:00
Dirk Dougherty
4b7fd8d649 Change youtube metadata refs to use https. am: 934e9d0614 am: 25dcd724af 
am: dea0ed01bf

* commit 'dea0ed01bfe8a2184f3ed34cf8c0e3310c3bea0a':
  Change youtube metadata refs to use https.

Change-Id: I6ebc20719a63e001f12c199b9e38aecb3d5b9ed1
 2016-05-02 19:34:28 +00:00
Dirk Dougherty
dea0ed01bf Change youtube metadata refs to use https. am: 934e9d0614 
am: 25dcd724af

* commit '25dcd724af6a8c585cb30bbed69da623eb3586bf':
  Change youtube metadata refs to use https.

Change-Id: I3de7b528ffcc9556ad9d412f4b4188d064a54e80
 2016-05-02 19:29:15 +00:00
Dirk Dougherty
630196620a Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. am: a74a6e5ba9 am: cabb54b570 
am: a9a3d22c99

* commit 'a9a3d22c9939103854290f60170169a47b614799':
  Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

Change-Id: Ic26af3d904c52fb2373142c33ce20f81a6d520b5
 2016-05-02 19:20:02 +00:00
Dirk Dougherty
a9a3d22c99 Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. am: a74a6e5ba9 
am: cabb54b570

* commit 'cabb54b57094b3e897df90b17d3a6b1c29cfd988':
  Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

Change-Id: I7ab0c1bddb67f7c6a68cd16b856c9083e2747a8c
 2016-05-02 19:15:17 +00:00
Dirk Dougherty
934e9d0614 Change youtube metadata refs to use https. 
Change-Id: I10f73bbdcce86de4918d7e57b7826b05e505d2d3
 2016-05-02 12:11:45 -07:00
Dirk Dougherty
a74a6e5ba9 Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. 
Change-Id: Id0053752db7bc304d02b78d04055b86b5e5e8ad5
 2016-05-02 11:47:13 -07:00
Janis Danisevskis
e0e6cf8e87 Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am: 73813c06cd am: d92fe240b9 
am: 38d54f72e3

* commit '38d54f72e3795eb67eceacf5325b14a13492b25d':
  Clarifies that filesystem permission 0700 is not enforced as an invariant

Change-Id: I12d68857f2fed0bb62b040df4193fc00cc97f500
 2016-05-02 08:12:08 +00:00
Janis Danisevskis
38d54f72e3 Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am: 73813c06cd 
am: d92fe240b9

* commit 'd92fe240b9811bd1b20af0b744f1aa727c80b97c':
  Clarifies that filesystem permission 0700 is not enforced as an invariant

Change-Id: I7371da3bffa54b8904bd18d52b9803fb45afa31e
 2016-05-02 08:08:03 +00:00
Janis Danisevskis
73813c06cd Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs 2016-05-02 07:53:53 +00:00
Jaewan Kim
a983e2c655 Fix documentation for drawable resource 
Change-Id: Ic7cd4dd75dc75c26184b71049589588fe658a9a3
 2016-05-02 11:31:16 +09:00
Amanda Kassay
a5d3e91cef Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs am: 8d21a984a6 am: 935c4835ac 
am: a7700c08fc

* commit 'a7700c08fc15d03efeaae39b093c4585a669208e':
  Update studio_tos modal with correct id. b/28425669

Change-Id: I08a5dd9daaa66717212aa553babe9701fadb17bf
 2016-04-29 17:39:04 +00:00
Amanda Kassay
a7700c08fc Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs am: 8d21a984a6 
am: 935c4835ac

* commit '935c4835aca0507b57d8d5aee7e5b544d4856f32':
  Update studio_tos modal with correct id. b/28425669

Change-Id: I38a93109a57589551f3abd539604b439a605b82d
 2016-04-29 17:36:09 +00:00
Amanda Kassay
8d21a984a6 Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs 2016-04-29 17:26:28 +00:00
Adam Lesinski
98a418758d Merge "Add Complex XML Resources guide to docs" into nyc-dev 2016-04-29 00:13:42 +00:00
Andrew Solovay
bc0b8ca0df docs: Moving library docs out of /tools/ am: 7877f69ddd am: 6bbce8db4f 
am: 4290ad19e2

* commit '4290ad19e2b96887b88a08e8e39629b34d4d4117':
  docs: Moving library docs out of /tools/

Change-Id: I3f42ace3cce49c0d66cc51607c6b7bf182a445c2
 2016-04-28 20:59:50 +00:00