Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,131 Commits 3 Branches 0 Tags
bb3af7d3ed47fe50b0aeea3bdf54aa78be5ebcf8
Commit Graph

12946 Commits

Author SHA1 Message Date
Amanda Kassay
c5484969b4 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be 
am: 5295a81926

* commit '5295a81926321bcb7059f645728e021264131227':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I4cdefd1ed0a858404428058b46edaf2eabc3f752
 2016-05-11 17:49:55 +00:00
Amanda Kassay
5295a81926 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef 
am: af218df0be

* commit 'af218df0be999d5aa08e580fc237c35eecc11839':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: Ie452073f4f159ea4210de3d8ff6c9a7a34a543fa
 2016-05-11 17:47:07 +00:00
Amanda Kassay
af218df0be Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 
am: 965f4bf1ef

* commit '965f4bf1ef2e8958ec9a53bab00be919a49bc8c2':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: If2a4f83aadd1994c86c34a9443cf50af96b633d6
 2016-05-11 17:44:06 +00:00
Amanda Kassay
965f4bf1ef Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs 2016-05-11 17:37:46 +00:00
Cheryl Potter
838a8280f8 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 am: 5c273ba194 
am: 1b59797ce5

* commit '1b59797ce56e080847f6b635dc5e92707ac45fb4':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I99842f49b7d7c927b8c720b3e161ec488c8c3cee
 2016-05-11 17:16:20 +00:00
Cheryl Potter
1b59797ce5 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs am: ae08263ac8 
am: 5c273ba194

* commit '5c273ba194deab8b0dc73b9632b936b7f088e7ac':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I651132147c73a9b96373c688a34437bf1d557c87
 2016-05-11 17:13:34 +00:00
Cheryl Potter
5c273ba194 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs 
am: ae08263ac8

* commit 'ae08263ac81277ad25a84cc3a30917f8f78a3153':
  docs: Fix missing image in Android Monitor Overview card b/28704424

Change-Id: I59128f6ff32ffab60e5e1dd43d8008d7d7d470e8
 2016-05-11 17:10:48 +00:00
Cheryl Potter
ae08263ac8 Merge "docs: Fix missing image in Android Monitor Overview card b/28704424" into mnc-mr-docs 2016-05-11 17:07:59 +00:00
smain@google.com
df9bf7da82 fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf am: 718d27d8dc 
am: 53b552d7f3

* commit '53b552d7f3f7071019a3c84d58d1e3fccc642c71':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie72fb65bdff90844cec767250cb33bbfba72c9f7
 2016-05-11 05:11:32 +00:00
smain@google.com
53b552d7f3 fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf 
am: 718d27d8dc

* commit '718d27d8dcd94a8b86ceb6e63782c8265f101570':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: I0d6623892a7dc99a35a2ef4f2e1f9431ab111117
 2016-05-11 05:08:30 +00:00
smain@google.com
718d27d8dc fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 
am: 0772f44acf

* commit '0772f44acfb710b9e587f543f9e4424c555c9083':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie8bfb9a6fe9858300571669e1fc2efe58d55b848
 2016-05-11 05:05:52 +00:00
smain@google.com
0772f44acf fix redirects, 
as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie0ff7349f5018913d63bf8c169dd4eacc7faca64
 2016-05-10 21:58:52 -07:00
Joe Fernandez
391cb4f7ce docs: DoDS Wear reference docs (regenerated) am: 95df02229c am: bc2c9b6d4c 
am: 6bbab0d7e8

* commit '6bbab0d7e8f200be4f4f58c3cdfe433c75aaf48d':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: I45c17dc1369004a243e8be0738798ae362fe4932
 2016-05-11 02:45:44 +00:00
Joe Fernandez
6bbab0d7e8 docs: DoDS Wear reference docs (regenerated) am: 95df02229c 
am: bc2c9b6d4c

* commit 'bc2c9b6d4c271b7d9bd4c5ec43246e5d9a142a56':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: I40a099f31d71cd4c7dc30d91297a41d77d69d6eb
 2016-05-11 02:42:40 +00:00
Joe Fernandez
bc2c9b6d4c docs: DoDS Wear reference docs (regenerated) 
am: 95df02229c

* commit '95df02229cd96d2bdb6c3966f0957e9faaeb72ad':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: Iad7c032b5557ba856c8b59d6e492a03034804b18
 2016-05-11 02:40:01 +00:00
Joe Fernandez
95df02229c docs: DoDS Wear reference docs (regenerated) 
b/28462526

Change-Id: I59874b401aafb76f965a9dc734db73abf68a1250
 2016-05-10 19:12:36 -07:00
Cheryl Potter
e885a56992 docs: Fix missing image in Android Monitor Overview card 
b/28704424

Change-Id: I2610d56a17d40dbc81fd211a7a435be639000c65
 2016-05-10 17:38:05 -07:00
Mary Yanchar
555ed25cff Updating redirects to correct Studio Tips and Tricks am: 8e2431513f am: 908a8703f0 
am: c712fdcc45

* commit 'c712fdcc4524face58cec7afd711a4d66db80e8d':
  Updating redirects to correct Studio Tips and Tricks

Change-Id: Iecda302c587733e8cd8f741aa8af52cb1cf8975c
 2016-05-10 21:22:33 +00:00
Mary Yanchar
c712fdcc45 Updating redirects to correct Studio Tips and Tricks am: 8e2431513f 
am: 908a8703f0

* commit '908a8703f0119367255d1d1a184f2f9b9b9c074a':
  Updating redirects to correct Studio Tips and Tricks

Change-Id: I4425c56a5e44b9c4426fab180ebcfbce702e660d
 2016-05-10 21:19:54 +00:00
Mary Yanchar
908a8703f0 Updating redirects to correct Studio Tips and Tricks 
am: 8e2431513f

* commit '8e2431513fbc32b64e240b9b39995b1217111bc6':
  Updating redirects to correct Studio Tips and Tricks

Change-Id: I16c631bb7ec38fba7ba11132c85e90cb205ff26d
 2016-05-10 21:13:51 +00:00
Mary Yanchar
8e2431513f Updating redirects to correct Studio Tips and Tricks 
Updating the _redirects.yaml to correct the Studio Tips and Tricks
redirect, to match the CL already submitted in Piper (121956464).

Bug: 28680261
Change-Id: I7fc075d26061c37a7b2ba20d91b6deca4dae6557
 2016-05-10 12:58:42 -07:00
Cheryl Potter
0158baf9fb docs: Add redirects for deleted files on AS devsite b/28679461 am: bc753be9e3 am: 90f143e1f3 
am: 9f2b8642a8

* commit '9f2b8642a8d496cceb0e0ab3ed0f67ae7f357ae0':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I3a1ae7b5c76cb6395ea2bfbfe8cea223fecf653a
 2016-05-10 18:37:18 +00:00
Cheryl Potter
9f2b8642a8 docs: Add redirects for deleted files on AS devsite b/28679461 am: bc753be9e3 
am: 90f143e1f3

* commit '90f143e1f384ae37878e46997e43b171384c421d':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I9e5c8225010dbfa631c6f51fad094def57e4db15
 2016-05-10 18:34:39 +00:00
Cheryl Potter
90f143e1f3 docs: Add redirects for deleted files on AS devsite b/28679461 
am: bc753be9e3

* commit 'bc753be9e3838cedfb2b45ef2076cc71f2cbe9b5':
  docs: Add redirects for deleted files on AS devsite b/28679461

Change-Id: I196bb7059c78439d051a5e3e9daac0033e4c6595
 2016-05-10 18:32:01 +00:00
Cheryl Potter
bc753be9e3 docs: Add redirects for deleted files on AS devsite 
b/28679461

Change-Id: I825cf17a4065b1af67fa1792cf66e50c30208e17
 2016-05-10 11:06:25 -07:00
Amanda Kassay
7cf1e9c403 Deleting pages so redirects work on DevSite. b/28670825 
Change-Id: I4eb039d96f3f1378ecf0960d31ffea1bfbca0520
 2016-05-10 11:10:44 -04:00
Janis Danisevskis
8f6c64d459 Merge "Updates training/camera/photobasics.jd with FileProvider details" into nyc-dev 2016-05-10 09:12:49 +00:00
Joe Fernandez
b31c073689 docs: Wear F Preview page infrastructure am: 9ccfe2553b 
am: 1b99b2ce92

* commit '1b99b2ce927ec16ade8f05f607eb190dc91b2548':
  docs: Wear F Preview page infrastructure

Change-Id: I2ac0d97023fad2c20f67f96d89921c19b7c72270
 2016-05-10 06:00:16 +00:00
Joe Fernandez
1b99b2ce92 docs: Wear F Preview page infrastructure 
am: 9ccfe2553b

* commit '9ccfe2553bb0f2cf5ae6f493f12042cf9fa1eba2':
  docs: Wear F Preview page infrastructure

Change-Id: I7665b4ecbd3c46a8ea7eb1a675933f43243911cc
 2016-05-10 05:54:38 +00:00
Joe Fernandez
9ccfe2553b docs: Wear F Preview page infrastructure 
- add new landing page for F Preview
- add new supporting pages for F Preview
- Update TOC file to list new pages

b/28004352

Change-Id: I3a4de8b3c756f1bbee91e136d67a413a5953277a
 2016-05-09 22:37:15 -07:00
smain@google.com
6be7049639 update the collections metadata for relocated studio pages. bug: 28632136 am: 8fb04c66c8 am: 6d18d5dc1f 
am: 78ac696e6b

* commit '78ac696e6b525b40d85c2699940da823198909ac':
  update the collections metadata for relocated studio pages. bug: 28632136

Change-Id: I70e4f37404e639b8afd579dbea8aefb6f983ce50
 2016-05-10 01:48:11 +00:00
smain@google.com
78ac696e6b update the collections metadata for relocated studio pages. bug: 28632136 am: 8fb04c66c8 
am: 6d18d5dc1f

* commit '6d18d5dc1f457661d798aef252391b67b71171f6':
  update the collections metadata for relocated studio pages. bug: 28632136

Change-Id: I26feb5b6fc327378d32e878301fef95d32076902
 2016-05-10 01:42:11 +00:00
smain@google.com
6d18d5dc1f update the collections metadata for relocated studio pages. bug: 28632136 
am: 8fb04c66c8

* commit '8fb04c66c8f51d39722a7b0be4f55812aac36270':
  update the collections metadata for relocated studio pages. bug: 28632136

Change-Id: I606539247da364cf02ae9645e0b4ee7b5c7fbd77
 2016-05-10 01:36:08 +00:00
smain@google.com
8fb04c66c8 update the collections metadata for relocated studio pages. 
bug: 28632136

Change-Id: I3c858523751c8a58b8ad90c15ffd5400925ad4df
 2016-05-09 17:55:54 -07:00
Janis Danisevskis
672b052115 Updates training/camera/photobasics.jd with FileProvider details 
As of Android N, passing file:// URIs across package boundaries
throws a FileUriExposedException. This has caused frustration among
app developers trying to use our example as boilerplate code. This
patch replaces the "take picture" example with one that uses
content:// URIs and FileProvider instead.

Bug: 27636012
Change-Id: I9f0b4d9bbcd6b4bfa770dd1e4ad37f321e22195f
 2016-05-09 18:34:22 +00:00
smain@google.com
0b0ad39b13 update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) am: f2f8dff6eb am: d20d4c6cf3 
am: 0d1bce5e5d

* commit '0d1bce5e5d3a0521466e8d12de792024325d8d91':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Iae2be6e4c6428e46ff1317d35eb3e12f97c6a813
 2016-05-09 17:39:31 +00:00
smain@google.com
0d1bce5e5d update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) am: f2f8dff6eb 
am: d20d4c6cf3

* commit 'd20d4c6cf3bc5891d2a63024b1c5ba3abf5ed77d':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Ib717a1f84f3c32ba6ccb762d0b3ffba6a1bd37e0
 2016-05-09 17:34:45 +00:00
smain@google.com
d20d4c6cf3 update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) 
am: f2f8dff6eb

* commit 'f2f8dff6eb50e673b32b8f6bb3c181267997aefd':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Ib906d725e2de7012ebd305d64e12fc434c16a5ca
 2016-05-09 17:30:33 +00:00
smain@google.com
f2f8dff6eb update the older redirects based on studio restructure 
(https://critique.corp.google.com/#review/121836018)

Change-Id: I5c7cb01da2afe18885444c9bd6a3fc09526a42a8
 2016-05-09 10:16:13 -07:00
smain@google.com
beb01ff874 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 am: ab5bf95626 am: 1a8f9e3ca0 
am: 5e42875297

* commit '5e428752971f2e3dfc3fda73633fc346f50f2763':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I76513a274909a296589c1354dfc0551764390e72
 2016-05-09 15:32:36 +00:00
smain@google.com
5e42875297 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 am: ab5bf95626 
am: 1a8f9e3ca0

* commit '1a8f9e3ca00fb4436710e34b1f7fb2259adc066f':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: Id0d7cf68025c8f6b082ebfdec6c9727e963d6b9a
 2016-05-09 15:28:14 +00:00
smain@google.com
1a8f9e3ca0 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 
am: ab5bf95626

* commit 'ab5bf95626850e97124b912ca2699fb164574186':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I7524aa066efa4241c6a14d881b23dee0da8e2632
 2016-05-09 15:23:51 +00:00
smain@google.com
ab5bf95626 update redirects for /studio files for the restructure 
from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I2c06eb12267f11d69a1dbd6f1c96a7bf1ef4a61c
 2016-05-09 15:12:40 +00:00
Dirk Dougherty
61926ad85f Merge "Add vanity url for bg optimations." into mnc-mr-docs am: d4c3473906 am: 4521e4e605 
am: 631316a832

* commit '631316a83231bdd1089261c165b87a9fff08822a':
  Add vanity url for bg optimations.

Change-Id: Iec34ba687fa442be88710e3f918be9fb721a9f11
 2016-05-06 02:24:40 +00:00
Dirk Dougherty
631316a832 Merge "Add vanity url for bg optimations." into mnc-mr-docs am: d4c3473906 
am: 4521e4e605

* commit '4521e4e60518b9c32948b2027822af8c30de8576':
  Add vanity url for bg optimations.

Change-Id: Ic05784b96e79b0222f59f1f9ee07edf9bce447f6
 2016-05-06 02:19:49 +00:00
Dirk Dougherty
4521e4e605 Merge "Add vanity url for bg optimations." into mnc-mr-docs 
am: d4c3473906

* commit 'd4c3473906ea86f9b18ffaa3856cb9d97fca139b':
  Add vanity url for bg optimations.

Change-Id: I765f0c558ff2d74c536cbdf4c0fbdf29dd690fdb
 2016-05-06 02:15:15 +00:00
Dirk Dougherty
d4c3473906 Merge "Add vanity url for bg optimations." into mnc-mr-docs 2016-05-06 02:02:16 +00:00
Dirk Dougherty
920bf8a339 Add vanity url for bg optimations. 
Change-Id: I34018b86a5da1abf6cf80427067d5b73eb1b2736
 2016-05-05 11:07:58 -07:00
Cheryl Potter
d2b11f93d8 resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f am: 34b9fa4d47 
am: aa99efdb72

* commit 'aa99efdb7290fa3dfdb06ebf756e5e6fb9ae446c':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I1a73b0e45b8940a940b59e1209d908567f59b04b
 2016-05-05 16:37:08 +00:00
Cheryl Potter
aa99efdb72 resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f 
am: 34b9fa4d47

* commit '34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I24359c6e2eea97383309610f60d83286a0663c7b
 2016-05-05 16:34:12 +00:00