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

7433 Commits

Author SHA1 Message Date
Robert Ly
993a3e4977 am 048d1076: am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 
* commit '048d1076aeb96adea969ad95996d3df931557241':
  Fix incorrect link in Android Wear documentation.
 2014-07-06 22:35:44 +00:00
Robert Ly
048d1076ae am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 
* commit '8f0f930d3bf8d74c4680cc94a8def9e3db0989b8':
  Fix incorrect link in Android Wear documentation.
 2014-07-06 22:31:00 +00:00
Flavio Lerda
474cdf258f Fix incorrect link in Android Wear documentation. 
The link name was misspelled and pointed to the wrong directory.

Change-Id: I471892349dbe3ebbe9ec425a2a78b172d2ec6a0f
 2014-07-06 21:59:06 +00:00
Nick Kralevich
e70766f32a am e1d8ee41: am ce259483: Merge "Added missing brace." 
* commit 'e1d8ee41c0567417c1d0486c0778673cfa9b75ee':
  Added missing brace.
 2014-07-05 17:06:18 +00:00
Nick Kralevich
3a62327631 am f397f6f1: am a2e4ce2b: Merge "Fix typo - issue 56671" 
* commit 'f397f6f10dc1d99182bc3903d4e3751d348a3320':
  Fix typo - issue 56671
 2014-07-05 17:06:04 +00:00
Nick Kralevich
0f59f9e7cf am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989" 
* commit '3b4c2c982ef4ac681929678288ce042e4c0a5be6':
  Fix Issue 59989
 2014-07-05 16:51:45 +00:00
Nick Kralevich
ce25948325 Merge "Added missing brace." 2014-07-03 01:32:01 +00:00
Nick Kralevich
a2e4ce2b7c Merge "Fix typo - issue 56671" 2014-07-03 01:32:01 +00:00
Nick Kralevich
63af727b4b Merge "Fix Issue 59989" 2014-07-02 20:52:43 +00:00
Nick Kralevich
a6e521ae89 am e70766f3: am e1d8ee41: am ce259483: Merge "Added missing brace." 
* commit 'e70766f32aa1f9f6ff33ac450fc39089e09801f0':
  Added missing brace.
 2014-07-05 17:12:14 +00:00
Nick Kralevich
56972a91f1 am 3a623276: am f397f6f1: am a2e4ce2b: Merge "Fix typo - issue 56671" 
* commit '3a62327631a0bbbb502af884257b6a430d7e3095':
  Fix typo - issue 56671
 2014-07-05 17:12:01 +00:00
Nick Kralevich
33b84f3dbe am 0f59f9e7: am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989" 
* commit '0f59f9e7cf6b501efeb6f33bf8ae289a47b6fbc9':
  Fix Issue 59989
 2014-07-05 16:57:00 +00:00
Robert Ly
2e3b9d30d4 am 9b3bfb10: docs: updated expandedtext_combo 
* commit '9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
  docs: updated expandedtext_combo
 2014-07-02 00:22:10 +00:00
Robert Ly
9b3bfb1085 docs: updated expandedtext_combo 
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
 2014-07-01 17:03:40 -07:00
Robert Ly
024d08ec12 am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev 
* commit 'f077e7b719419271b5fd666c22b7d19177d6c325':
  docs: add more notification images
 2014-07-02 00:00:59 +00:00
Robert Ly
098e5d3f79 am 2e3b9d30: am 9b3bfb10: docs: updated expandedtext_combo 
* commit '2e3b9d30d4e16ecc0b3e4a04252b23afe55dda8c':
  docs: updated expandedtext_combo
 2014-07-02 00:27:34 +00:00
Robert Ly
f077e7b719 Merge "docs: add more notification images" into klp-modular-dev 2014-07-01 14:48:56 +00:00
Robert Ly
528f2aafb3 docs: add more notification images 
Change-Id: Ia71ef7783c89da319a9179a4f1c4ab197df818c5
 2014-07-01 16:52:56 -07:00
Robert Ly
a7f3321642 am 024d08ec: am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev 
* commit '024d08ec126c52fc52fbb7242fc2384c13f3a8f6':
  docs: add more notification images
 2014-07-02 00:06:01 +00:00
Robert Ly
9baaf2ce84 am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
  docs: add new UX images for notifications and wear
 2014-07-01 02:52:30 +00:00
Robert Ly
7459dfed6c Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 2014-06-30 22:24:07 +00:00
Robert Ly
bdc5428410 docs: add new UX images for notifications and wear 
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
 2014-06-30 19:33:37 -07:00
Quddus Chong
62395c9379 am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 
* commit '5212ee08f3061c07a6a323e9169b63b596c4c824':
  docs: Add Javadocs for GMS Longhorn.
 2014-06-30 21:51:32 +00:00
Quddus Chong
69fc782a8b am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '85a25e02004f77595e352e03c1fdb11b6126db69':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:51:28 +00:00
Tim Kilbourn
6f1a231a0b am 326b1857: Merge "Fix docs" into klp-modular-dev 
* commit '326b1857a5ced49f249358751e05ce237bfaefc8':
  Fix docs
 2014-06-30 20:54:30 +00:00
Robert Ly
07fd3652aa am e1e35d13: docs: fix notifications docs 
* commit 'e1e35d13023224c22a54ce074c45d2f8729b1c60':
  docs: fix notifications docs
 2014-06-30 20:17:33 +00:00
Robert Ly
e1e35d1302 docs: fix notifications docs 
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
 2014-06-30 13:11:39 -07:00
Quddus Chong
5212ee08f3 Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 2014-06-30 17:43:33 +00:00
Dirk Dougherty
7ec3cf540a am 7ecb89fc: Merge "Change card title for admob." into klp-modular-dev 
* commit '7ecb89fc1e2b07e51dcc52fe6e778855dfb92c15':
  Change card title for admob.
 2014-06-30 01:06:15 +00:00
Dirk Dougherty
d64ac2a67f am 14ec9ade: Merge "Doc change: API diff 20." into klp-modular-dev 
* commit '14ec9adefa1cad0c5444bc938f0edaebaf4d1eee':
  Doc change: API diff 20.
 2014-06-30 01:06:11 +00:00
Robert Ly
05759ef766 am 6fff230d: Merge "docs : fix broken links" into klp-modular-dev 
* commit '6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
  docs : fix broken links
 2014-06-29 23:42:55 +00:00
Robert Ly
2b906dfb95 am 50b55d61: docs: update notifications docs 
* commit '50b55d61af63098d0b95e38afdc5c381b3373cd6':
  docs: update notifications docs
 2014-06-29 23:42:50 +00:00
Robert Ly
50b55d61af docs: update notifications docs 
Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd
 2014-06-29 16:20:28 -07:00
Scott Main
e2af77e635 am 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 
* commit '7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
  docs: fix L Preview G+ links (permanently)
 2014-06-28 02:39:37 +00:00
smain@google.com
fa8e81135a am d2b869d0: revisions to the app structure design guide 
* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
  revisions to the app structure design guide
 2014-06-28 02:32:24 +00:00
smain@google.com
d2b869d052 revisions to the app structure design guide 
Change-Id: I15e68e454180b848db81791350ba7985817c0930
 2014-06-27 18:43:50 -07:00
smain@google.com
323d0c56aa am 67421351: Merge "fix links to wear downloads" into klp-modular-dev 
* commit '67421351cc6fd99aef741bb3bc2599bcb1288d1d':
  fix links to wear downloads
 2014-06-27 22:57:57 +00:00
Quddus Chong
559c0060bb docs: Add Javadocs for GMS Longhorn. 
Change-Id: I2662b0af0609450364cbcc4666535fd57eec3ce7
 2014-06-27 13:31:17 -07:00
Robert Ly
00a05a902f am 6ebcfb87: docs: notif image 
* commit '6ebcfb87b8111ee7110aeade6fba35e1862528da':
  docs: notif image
 2014-06-27 18:17:19 +00:00
Robert Ly
6ebcfb87b8 docs: notif image 
Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46
 2014-06-27 11:12:04 -07:00
Robert Ly
b76f6afeca am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev 
* commit '137d9da3aab652dccc82f4b5741d1c48b8b6cfe9':
  docs: fix images for notifications
 2014-06-27 18:03:41 +00:00
Robert Ly
a1180f7b72 am 5627b521: Merge "fix build" into klp-modular-dev 
* commit '5627b521e058058b2496a076256b727e0635ea88':
  fix build
 2014-06-27 17:21:18 +00:00
Robert Ly
672b1d13c9 am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev 
* commit 'ba1029257999fbfc6c7741d05cee10b8f2036f2f':
  more doc fixes for notifcations and wear
 2014-06-27 17:13:40 +00:00
Quddus Chong
85a25e0200 Merge "docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Tim Kilbourn
326b1857a5 Merge "Fix docs" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Tim Kilbourn
3eabe93438 Fix docs 
Update a few references to the Leanback theme.

https://code.google.com/p/android/issues/detail?id=72757

Change-Id: I47387433cc02fd29b62b729bc34756cef1d539f3
 2014-06-30 13:36:55 -07:00
Scott Main
7b5abd15ab Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Joe Fernandez
f50f51cfbd docs: fix L Preview G+ links (permanently) 
Change-Id: I699ae07a977495a23c3cb0f440f90c856bc17a3e
 2014-06-27 17:00:59 -07:00
Robert Ly
5627b521e0 Merge "fix build" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Robert Ly
af0ce935c3 fix build 
Change-Id: I66278269f8f02358c6d2529ef8839eb1ea42fdc4
 2014-06-27 10:13:58 -07:00