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

8977 Commits

Author SHA1 Message Date
Rich Slogar
bd1fb4021f am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs 
automerge: 0f60943

* commit '0f609432222e9eb946bfaa2bee45301324b97311':
  docs: note to install linux packages
 2015-02-18 00:18:54 +00:00
Rich Slogar
f82c88e28e am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs 
automerge: 5f31276

* commit '5f3127620255167469fcba3d21334eb23217611d':
  docs: studio training basics create and run project updates
 2015-02-18 00:17:27 +00:00
Andrew Solovay
4eb14e0294 am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 
automerge: 8d5ba01

* commit '8d5ba018266448caeb44637d273f63dbff2956af':
  docs: Noted that purchaseToken is long and cannot be truncated.
 2015-02-18 00:15:58 +00:00
Rich Sloager
dcf68e83d6 am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs 
automerge: d225cfc

* commit 'd225cfc811fd2f4041195b6df1094e2a8a13d3be':
  Revert "docs: studio proxy setup"
 2015-02-18 00:14:42 +00:00
Rich Slogar
502f303c61 am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs 
automerge: 797c989

* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
  docs: site mipmap folder updates
 2015-02-18 00:13:07 +00:00
Rich Slogar
6cdde6718c am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs 
automerge: c694604

* commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
  docs: studio mipmap update
 2015-02-18 00:11:42 +00:00
Rich Slogar
717b4d130f Merge "docs: note to install linux packages" into lmp-docs 2015-02-17 23:54:50 +00:00
Rich Slogar
9911aa5125 Merge "docs: studio training basics create and run project updates" into lmp-docs 2015-02-17 23:40:36 +00:00
Andrew Solovay
fd454a579f Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs 2015-02-17 22:41:04 +00:00
Rich Slogar
82510fa5a6 am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
automerge: fa40f00

* commit 'fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:28:45 +00:00
Oliver Woodman
2a6bf82e26 am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs 
automerge: a40eb5d

* commit 'a40eb5db455ebb225a7ff0afa244256079d8cf20':
  Update ExoPlayer developer guide.
 2015-02-17 22:27:16 +00:00
Rich Slogar
dbb32faf33 am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs 
automerge: bff1545

* commit 'bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
  docs: studio revision 1-1
 2015-02-17 22:25:53 +00:00
Rich Slogar
2d43b7300d am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs 
automerge: cb73fb9

* commit 'cb73fb90443a3a3fee645aa3f01d38b19f108377':
  docs: android plugin for gradle revisions page
 2015-02-17 22:24:38 +00:00
David Friedman
a6614a12bb am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 
automerge: efb69b0

* commit 'efb69b003e24757fbf04f219a61a4a71adada3a2':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-17 22:22:50 +00:00
Rich Sloager
099ce51393 Merge "Revert "docs: studio proxy setup"" into lmp-docs 2015-02-17 22:13:45 +00:00
Rich Sloager
383dacc738 Revert "docs: studio proxy setup" 
This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024.

Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
 2015-02-17 22:10:27 +00:00
Rich Slogar
40132ee15a Merge "docs: site mipmap folder updates" into lmp-docs 2015-02-17 22:08:42 +00:00
Rich Slogar
3c3b780cae Merge "docs: studio mipmap update" into lmp-docs 2015-02-17 22:06:46 +00:00
Rich Slogar
8823b93d5c Merge changes If3a78fc7,Ifbe3f03a into lmp-docs 
* changes:
  docs: studio proxy setting setup
  docs: studio proxy setup
 2015-02-17 22:02:45 +00:00
Oliver Woodman
fe3e71befa Merge "Update ExoPlayer developer guide." into lmp-docs 2015-02-17 20:48:50 +00:00
Oliver Woodman
a2e9e27f4c Update ExoPlayer developer guide. 
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.

Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
 2015-02-17 20:47:17 +00:00
Rich Slogar
76dd6aa7f9 Merge "docs: studio revision 1-1" into lmp-docs 2015-02-17 20:37:52 +00:00
Rich Slogar
69223702e4 docs: site mipmap folder updates 
b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
 2015-02-17 12:34:35 -08:00
Rich Slogar
4abf87f134 Merge "docs: android plugin for gradle revisions page" into lmp-docs 2015-02-17 20:16:09 +00:00
David Friedman
03efba0e3a Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 2015-02-14 02:36:34 +00:00
Rich Slogar
38f2242e39 docs: studio mipmap update 
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
 2015-02-13 17:17:41 -08:00
Rich Slogar
0726a31f2b docs: studio proxy setting setup 
b/18332702

Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
 2015-02-13 16:44:32 -08:00
Rich Slogar
9bd6de1eac docs: studio revision 1-1 
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
 2015-02-13 15:19:31 -08:00
Rich Slogar
3150bb78e6 docs: android plugin for gradle revisions page 
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
 2015-02-13 14:58:10 -08:00
Luan Nguyen
4b2fb0a5e2 docs: Fix issue with older devices section not expanding 
bug: 19381237
Change-Id: I3d881f36b8aac6f6a845141b33e8e383356ffcb4
 2015-02-13 11:23:50 -08:00
smain@google.com
852e0e347a add tags for wakelock and other API names 
Change-Id: Ic9831165d38b3f9642bc14fca2271c8506550ff4
 2015-02-13 09:58:42 -08:00
David Friedman
d350c5ced5 This file is misplaced, and serves no purpose. I am sending it to oblivion. 
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
 2015-02-12 21:30:59 -08:00
Andrew Solovay
c860242cc1 docs: Noted that purchaseToken is long and cannot be truncated. 
Noted in reference and integration doc that the token for Google Play
purchases may be up to 1,000 chars long, and the entire token must
be returned (not abbreviated or truncated) to any method that needs
it.

See first comment for doc stage location.

bug: 19099521
Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90
 2015-02-12 17:05:43 -08:00
Luan Nguyen
474746c7b0 am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
automerge: fe2c687

* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53 am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
automerge: e0306bb

* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
automerge: 946bf2d

* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:13:35 +00:00
Luan Nguyen
8d0df9b891 Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 2015-02-12 19:01:03 +00:00
Luan Nguyen
fe5e7e92a1 Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 2015-02-12 17:11:28 +00:00
Luan Nguyen
e1f90b4e1e Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 2015-02-12 17:10:50 +00:00
Luan Nguyen
e4b5387d62 docs: Fix issue with onCreate() method declaration in file backup section 
bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
 2015-02-11 11:38:41 -08:00
Luan Nguyen
14ec5fe09e docs: Update device art generator to include Wear generic devices. 
bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
 2015-02-11 11:17:10 -08:00
Shanea King-Roberson
696b68c4fc am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:17:53 +00:00
Luan Nguyen
891718acd5 docs: Fix notification api guide issues (7461154, 12765600) 
bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
 2015-02-10 12:05:50 -08:00
Shanea King-Roberson
c86ac21f73 Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 2015-02-10 19:57:30 +00:00
Luan Nguyen
18fc7b8554 am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:56:32 +00:00
Luan Nguyen
e49fbfa21c Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e Adding videos for 5.0 changes and watch face development. 
On branch pilot-videos
 Changes to be committed:
	modified:   docs/html/about/versions/android-5.0-changes.jd
	modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
 2015-02-10 10:29:36 -08:00
Eric Gilmore
f35e815939 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
automerge: 2b36779

* commit '2b36779f30a511cc4439a519c95963280a779fdc':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:05:23 +00:00
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
Eric Gilmore
c9dbaf0483 Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 2015-02-10 01:13:03 +00:00