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

198992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
043e4d02ba Merge "Doc change: Add best practices docs for permissions and ids." into mnc-docs 
am: fff4fd8710

* commit 'fff4fd8710f2b7eecaf5967da104fe1ee475619c':
  Doc change: Add best practices docs for permissions and ids.
 2016-01-14 02:24:52 +00:00
Dirk Dougherty
fff4fd8710 Merge "Doc change: Add best practices docs for permissions and ids." into mnc-docs 2016-01-14 02:21:00 +00:00
Dirk Dougherty
6404e8436b Doc change: Add best practices docs for permissions and ids. 
Change-Id: I5756c6d1b87690ac26631ed7c18d27bf0b80ce36
 2016-01-13 18:14:40 -08:00
Andrew Solovay
565c8983ce Merge "docs: New documentation for In-app Billing Promotions" into mnc-docs 
am: 5d312a0587

* commit '5d312a058751d5c523052833af7b8431b67dd17f':
  docs: New documentation for In-app Billing Promotions
 2016-01-13 23:14:25 +00:00
Andrew Solovay
5d312a0587 Merge "docs: New documentation for In-app Billing Promotions" into mnc-docs 2016-01-13 23:07:35 +00:00
Dan Dascalescu
b98c4e2978 Merge "docs: Add missing "classes" to Content Provider Basics" into mnc-docs 
am: 4c6a234e10

* commit '4c6a234e10354d2c5328469ab9f310ea0f2437b7':
  docs: Add missing "classes" to Content Provider Basics
 2016-01-13 20:47:15 +00:00
Dan Dascalescu
5143a2c487 Merge "Fix typo "pass" -> "passes"" into mnc-docs 
am: 559f506486

* commit '559f506486ae073d0ecaa467a958d1ffebc40074':
  Fix typo "pass" -> "passes"
 2016-01-13 20:45:40 +00:00
Dan Dascalescu
f31dc68e51 Merge "Fix typo "required by you" -> of" into mnc-docs 
am: 226f1c4f9a

* commit '226f1c4f9a14f21d9f7704b89b840c66b58003a6':
  Fix typo "required by you" -> of
 2016-01-13 20:44:04 +00:00
Dan Dascalescu
4c6a234e10 Merge "docs: Add missing "classes" to Content Provider Basics" into mnc-docs 2016-01-13 20:39:38 +00:00
Dan Dascalescu
559f506486 Merge "Fix typo "pass" -> "passes"" into mnc-docs 2016-01-13 20:39:14 +00:00
Dan Dascalescu
226f1c4f9a Merge "Fix typo "required by you" -> of" into mnc-docs 2016-01-13 20:37:56 +00:00
Dan Dascalescu
75608423e9 Merge "Add missing "from" in Content Provider Basics" into mnc-docs 
am: 79c4164c9d

* commit '79c4164c9d09a11f719e649f39ba9b9fa6d89cd0':
  Add missing "from" in Content Provider Basics
 2016-01-13 18:53:36 +00:00
Dan Dascalescu
dff8ac69c0 Merge "docs: Fix typo: remove "a" from Activities" into mnc-docs 
am: dc19588da1

* commit 'dc19588da1121dce6819389646607dc551071ba3':
  docs: Fix typo: remove "a" from Activities
 2016-01-13 18:51:57 +00:00
Dan Dascalescu
c6182d0557 Merge "docs: Fixed typo" into mnc-docs 
am: c4e6e8eaeb

* commit 'c4e6e8eaebdd56e8602e12c14d98f246ca9ebc74':
  docs: Fixed typo
 2016-01-13 18:50:16 +00:00
Dan Dascalescu
7b3ee05d71 Merge "Fix typo: add "the" in Content Provider Basics" into mnc-docs 
am: ffd5d38d3f

* commit 'ffd5d38d3f0e0eb19caf86192ef1927ffe514b7c':
  Fix typo: add "the" in Content Provider Basics
 2016-01-13 18:48:43 +00:00
Dan Dascalescu
5c7e76a866 Merge "Fix "java" capitalization in Intent.html" into mnc-docs 
am: a4514e4552

* commit 'a4514e4552962aa2f80df4f3b2431881f648e521':
  Fix "java" capitalization in Intent.html
 2016-01-13 18:47:08 +00:00
Dan Dascalescu
ec4886d7ad Merge "docs: Fix typo "Electrocargiogram", b/26355880" into mnc-docs 
am: 9f7d8d1469

* commit '9f7d8d14697a7731285227f5c226179b2b111f9f':
  docs: Fix typo "Electrocargiogram", b/26355880
 2016-01-13 18:45:25 +00:00
Dan Yu
fe6a561d5d Merge "docs: Adding screenshot for Now Playing page" into mnc-docs 
am: 52ffcbf5e9

* commit '52ffcbf5e96c6f0dfa7c6101b33890c95653c6c7':
  docs: Adding screenshot for Now Playing page
 2016-01-13 18:43:13 +00:00
Dan Dascalescu
79c4164c9d Merge "Add missing "from" in Content Provider Basics" into mnc-docs 2016-01-13 18:20:16 +00:00
Dan Dascalescu
dc19588da1 Merge "docs: Fix typo: remove "a" from Activities" into mnc-docs 2016-01-13 18:19:51 +00:00
Dan Dascalescu
c4e6e8eaeb Merge "docs: Fixed typo" into mnc-docs 2016-01-13 18:19:27 +00:00
Dan Dascalescu
ffd5d38d3f Merge "Fix typo: add "the" in Content Provider Basics" into mnc-docs 2016-01-13 18:18:08 +00:00
Dan Dascalescu
a4514e4552 Merge "Fix "java" capitalization in Intent.html" into mnc-docs 2016-01-13 18:17:51 +00:00
Dan Dascalescu
9f7d8d1469 Merge "docs: Fix typo "Electrocargiogram", b/26355880" into mnc-docs 2016-01-13 18:16:58 +00:00
Dan Yu
52ffcbf5e9 Merge "docs: Adding screenshot for Now Playing page" into mnc-docs 2016-01-13 17:40:34 +00:00
Dan Dascalescu
e9956f251a docs: Add missing "classes" to Content Provider Basics 
Also uppercase "Uri" to "URI"

bug: 26339372
Change-Id: I822889f490356cd680a0b29c2b66429d5888e654
 2016-01-12 16:54:25 -08:00
Dan Dascalescu
40ef11b384 docs: Fix typo: remove "a" from Activities 
bug: 26097787
Change-Id: I00049d80627aea6f7e8481fed4bbf7831d7abdc2
 2016-01-12 16:46:29 -08:00
Dan Dascalescu
07e36d8527 Fix typo: add "the" in Content Provider Basics 
bug: 26339577
Change-Id: Idb94dc2399338394820b2a21592e011308f7b01e
 2016-01-12 16:42:00 -08:00
Dan Dascalescu
27d2fbcd1b Add missing "from" in Content Provider Basics 
bug: 26339580
Change-Id: I173b8c7f4f041aa5a685f0bf45fc2a746c0fa65a
 2016-01-12 16:37:41 -08:00
Dan Dascalescu
7e88f9d36b Fix "java" capitalization in Intent.html 
bug: 26403924
Change-Id: I300c87597de14318a3c77f790d25fea3ad5ef6f6
 2016-01-12 16:34:20 -08:00
Dan Dascalescu
9ca7d35323 Fix typo "pass" -> "passes" 
bug: 26016604
Change-Id: Idab945201fc5c13c4a505c1bc4d73147d5a4bce8
 2016-01-12 16:29:31 -08:00
Dan Dascalescu
73840a4fa8 Fix typo "required by you" -> of 
bug: 26190340
Change-Id: I540ce90fcf7ec758a4d7f7bfad46f1616d49adaf
 2016-01-12 16:24:40 -08:00
Dan Dascalescu
bebb65bba3 docs: Fix typo "Electrocargiogram", b/26355880 
bug: 26355880
Change-Id: Ibf45cf4db1d5a94e42ac1841991da9570a5f8656
 2016-01-12 16:14:59 -08:00
Dirk Dougherty
5d7876fdf2 Merge "Doc change: Clarify acceptable use cases for Doze / Standby." into mnc-docs 
am: a95c52f375

* commit 'a95c52f3750073516c2cc1ae3e5278fd45b02891':
  Doc change: Clarify acceptable use cases for Doze / Standby.
 2016-01-12 20:59:59 +00:00
Dirk Dougherty
a95c52f375 Merge "Doc change: Clarify acceptable use cases for Doze / Standby." into mnc-docs 2016-01-12 20:57:29 +00:00
Dan Dascalescu
d8e259b367 docs: Fixed typo 
Also removed some insignificant whitespace.

bug: 26403380
Change-Id: I7af02f172f2110b9700c451db72f429c62613f8e
 2016-01-12 12:54:40 -08:00
Andrew Solovay
07e7767387 Merge "Corrected code snippet for reveal effect" into mnc-docs 
am: b203ea3fe6

* commit 'b203ea3fe6d2d30fe0815db7eee2cc1c141acec5':
  Corrected code snippet for reveal effect
 2016-01-12 18:54:15 +00:00
Andrew Solovay
b203ea3fe6 Merge "Corrected code snippet for reveal effect" into mnc-docs 2016-01-12 18:46:05 +00:00
Andrew Solovay
22c77a8711 docs: New documentation for In-app Billing Promotions 
Doc for new feature. See first comment for doc stage location.

bug: 25185711
Change-Id: I3680c1e7670c6c87985b136158047c9bb1b58156
 2016-01-11 17:43:28 -08:00
Sreevani Sreejith
bc9350fa50 Merge "docs: Documented the new media constant used to determine if an app is currently selected by the user." into mnc-docs 
am: ad12e4d102

* commit 'ad12e4d10263d13fb6bb4d1c4c476fcad759deb5':
  docs: Documented the new media constant used to determine if an app is currently selected by the user.
 2016-01-08 23:07:08 +00:00
Sreevani Sreejith
ad12e4d102 Merge "docs: Documented the new media constant used to determine if an app is currently selected by the user." into mnc-docs 2016-01-08 23:03:19 +00:00
Dirk Dougherty
6a3854314c Doc change: Clarify acceptable use cases for Doze / Standby. 
Change-Id: I059e1efb7f2cb34dc4d1e12cccacfa02fa436458
 2016-01-07 18:18:05 -08:00
sreevanis
1b3f51c4e1 docs: Documented the new media constant used to determine if an app is 
currently selected by the user.

Bug:23191905
Change-Id: I144a6ed115b48c4d834c64efbc6538779c7143c8
 2016-01-07 12:58:31 -08:00
Andrew Solovay
40f862e06b docs: Fixed TOC typo and other formatting problems 
am: 7f85bb12d2

* commit '7f85bb12d2c3d14ee8721e93ddb6090a3000523b':
  docs: Fixed TOC typo and other formatting problems
 2016-01-07 02:31:17 +00:00
Andrew Solovay
7f85bb12d2 docs: Fixed TOC typo and other formatting problems 
TOC link was missing a needed #. While I had the file open I fixed
other formatting issues (overlong lines, code snippets that
shouldn't have been pretty-printed). No changes to the page content.

I'll build and stage (see first comment for staged doc location) but
if it looks good I'll +2 and submit it myself.

bug: 26191770
Change-Id: I3c15ed3dfaa0762729f8d778d4aa828710c0eefa
 2016-01-06 17:25:12 -08:00
Daniel Yu
e81f8ebd49 docs: Adding screenshot for Now Playing page 
A follow-up to Chris Cartland's changes to the Now Playing
page (http://ag/831240 ), adding a supporting screenshot
that shows a Now Playing card with media in the background.

New PNG added at:
docs/html/images/training/tv/playback/now-playing-screen.png

Updated to use new version of PNG with more whitespace cropped
out (thanks Andrew!)

Bug: 26345930
Change-Id: I217fcc062f80734aebe32ec3a94ec7595756e78c
 2016-01-05 16:28:43 -08:00
Andrew Solovay
af449795fb Merge "docs: Removing now-deprecated (and never-used) FLASHLIGHT permission" into mnc-docs 
am: 6df19be4a3

* commit '6df19be4a32fd4b350a078def14a87e05a3efaab':
  docs: Removing now-deprecated (and never-used) FLASHLIGHT permission
 2016-01-05 22:47:11 +00:00
Andrew Solovay
6df19be4a3 Merge "docs: Removing now-deprecated (and never-used) FLASHLIGHT permission" into mnc-docs 2016-01-05 22:43:37 +00:00
Andrew Solovay
17f19f06b9 docs: Removing now-deprecated (and never-used) FLASHLIGHT permission 
Per bug b/26383626 , the FLASHLIGHT permission was never actually
used, and isn't checked by the new CameraManager.setTorchMode()
method. The permission has been removed from the manifest on
master; there's no reason to list it now in the list of normal
permissions.

See first comment for doc stage location.

bug: 26383626
Change-Id: I0c39dd5e1cdde1fc6a85759663b7e5ad669dc280
 2016-01-04 16:43:27 -08:00
Joe Fernandez
4cb8671fa7 Merge "docs: Android Dashboard - January 2016" into mnc-docs 
am: d774e8c6bb

* commit 'd774e8c6bb97e687887a5f1e9c3171be7617690a':
  docs: Android Dashboard - January 2016
 2016-01-04 22:20:13 +00:00