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

155821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
efb69b003e am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 
* commit '53ec037f9eb0e29f958faa334cf23c35f079eb85':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-14 02:50:49 +00:00
David Friedman
53ec037f9e am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs 
* commit '03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.
 2015-02-14 02:42:44 +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
Deepanshu Gupta
068499111c am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev 
* commit 'ad879adb65ffa577844738522ab6d7d30aba2ead':
  Add Asset management support for fonts.
 2015-02-13 22:38:23 +00:00
Diego Perez
a912fedbc5 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev 
* commit '98c3461acd6699ab0448f1785909d0d39cd61b5a':
  Do not paint shadow if outside of the clip area
 2015-02-13 22:38:17 +00:00
Deepanshu Gupta
4e47416012 am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev 
* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
  Changes made by intelliJ 14.1
 2015-02-13 22:38:07 +00:00
Deepanshu Gupta
ad879adb65 Merge "Add Asset management support for fonts." into lmp-dev 2015-02-13 22:34:36 +00:00
Diego Perez
98c3461acd Merge "Do not paint shadow if outside of the clip area" into lmp-dev 2015-02-13 22:34:16 +00:00
Deepanshu Gupta
12c9e4980e Merge "Changes made by intelliJ 14.1" into lmp-dev 2015-02-13 22:33:48 +00: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
fe2c687b97 am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
* commit '2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
  docs: Update device art generator to include Wear generic devices.
 2015-02-12 19:13:47 +00:00
Luan Nguyen
2ea209ab4c am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
* commit '8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
  docs: Update device art generator to include Wear generic devices.
 2015-02-12 19:07:47 +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
e0306bbece am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
* commit 'e726495a269b48f9b94fa9e545f84e79d587a282':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-12 17:35:43 +00:00
Luan Nguyen
946bf2de30 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
* commit 'b6de0316a8f77b4425057eb4e75f7375c47fad65':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-12 17:35:38 +00:00
Luan Nguyen
e726495a26 am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
* commit 'fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-12 17:17:04 +00:00
Luan Nguyen
b6de0316a8 am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
* commit 'e1f90b4e1e438c0086409ae0253a6452f2befbac':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-12 17:16:59 +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
Leon Scroggins III
b296e4e0c2 Check that bitmap's size does not exceed 32 bits. DO NOT MERGE 
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
(cherry picked from commit 89a2466a2a2859df5f29350117efd7f9d6a2e32f)
 2015-02-10 22:23:53 +00:00
Shanea King-Roberson
24513bc580 am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '3162289445ebade804c422162578d328c4762372':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:10:38 +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
3162289445 am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:04:17 +00: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
ba795593e5 am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '9b432bbece3cca6316b2638a947983e21c65917f':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:47:38 +00:00
Luan Nguyen
9b432bbece am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:40:34 +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
2b36779f30 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:56:51 +00:00
Eric Gilmore
99b91b2fd2 am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:45:47 +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
kmccormick
0137175af9 Doc change: refactor GCM docs to be platform-agnostic. 
Fix for:

b/17733410

Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
 2015-02-09 16:28:15 -08:00
Joe Fernandez
66c06cf9bb am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'd224fb8a6c86b0c26c5db570cead5f19ff7133bd':
  docs: remove + annotations in version references
 2015-02-07 01:08:46 +00:00
Joe Fernandez
d224fb8a6c am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs 
* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references
 2015-02-07 01:00:53 +00:00
Joe Fernandez
ba20f98c88 Merge "docs: remove + annotations in version references" into lmp-docs 2015-02-07 00:55:17 +00:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
 2015-02-05 20:27:59 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java. 
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
 2015-02-05 20:18:03 +00:00
John Spurlock
e08523684d Fix a few typos in Parcel.java. 
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
 2015-02-04 23:18:09 +00:00
Deepanshu Gupta
19740a6212 Changes made by intelliJ 14.1 
Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4
 2015-02-04 11:17:33 -08:00
Diego Perez
0dfba38010 Do not paint shadow if outside of the clip area 
Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
 2015-02-04 11:57:20 +00:00