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

9134 Commits

Author SHA1 Message Date
Rich Slogar
d1a274f283 am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a automerge: bdc1a3d 
automerge: 3a586c0

* commit '3a586c032c2cf39da72882c6466aa198ec7c85dc':
  docs: sdk revision 24.0.2
 2014-12-18 02:03:53 +00:00
Eric Gilmore
6b1ecbea31 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f automerge: 65e7a2b 
automerge: 982e5eb

* commit '982e5eb3655f20608c1ae492c4366f2fb35cdd2c':
  Adding links for the last few files requested by PMs.
 2014-12-18 02:02:41 +00:00
Rich Slogar
3a586c032c am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a 
automerge: bdc1a3d

* commit 'bdc1a3d03a8dee874e782dc9e2423571cce70406':
  docs: sdk revision 24.0.2
 2014-12-18 01:57:51 +00:00
Eric Gilmore
982e5eb365 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f 
automerge: 65e7a2b

* commit '65e7a2b74f2f01da74ae0c13ada1841b24ea5cf7':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:56:40 +00:00
Rich Slogar
6dfc3aab02 am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 
automerge: 85e645a

* commit '85e645ac2bf38186dce177e29f7062a3645c7917':
  docs: sdk revision 24.0.2
 2014-12-18 01:33:53 +00:00
Eric Gilmore
2195f58301 am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. 
automerge: 8d2af0f

* commit '8d2af0f9daf672183262a226e9c9410c54c133a2':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:32:41 +00:00
Rich Slogar
8838a9f083 docs: sdk revision 24.0.2 
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
 2014-12-17 16:40:53 -08:00
Eric Gilmore
fe7b93f4f7 Adding links for the last few files requested by PMs. 
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
 2014-12-17 15:46:37 -08:00
smain@google.com
1dd971866a am 2dbb8e13: am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288 
* commit '2dbb8e13de3a7ced961bbf84733f47e21a6a823d':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:12:23 +00:00
smain@google.com
2dbb8e13de am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288 
* commit '2448afdb729bfab4c9e2ac8af124870fd5929a08':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 20:06:02 +00:00
smain@google.com
c6de288eab am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 
automerge: 2a53e24

* commit '2a53e24e10654b7f5667899c8a110ef6742c79e3':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 19:57:42 +00:00
Joe Fernandez
aca5182e4c am ab23dec3: am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'ab23dec39e0e73c46a2c4fa1aa27924e04b08ecd':
  docs: studio revision 21 update
 2014-12-17 18:02:18 +00:00
Joe Fernandez
099e49872c am 09d6ed50: am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit '09d6ed50a7e470c8f2b63736a66ceed11f9cbd49':
  docs: help-adt link updates
 2014-12-17 17:55:47 +00:00
Joe Fernandez
ab23dec39e am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'fa7d86a115f6c0afaf7708a936918e16cfc3aa0a':
  docs: studio revision 21 update
 2014-12-17 17:55:45 +00:00
smain@google.com
4842228377 Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 2014-12-17 17:52:08 +00:00
smain@google.com
58bd02739e make hidden text hidden with negative indent to avoid horizontal scroll 
bug: 18721145

Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
 2014-12-17 09:50:26 -08:00
Joe Fernandez
09d6ed50a7 am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit 'a5142ca4d488fa216342213784df61b2e090cacb':
  docs: help-adt link updates
 2014-12-17 17:49:47 +00:00
Joe Fernandez
e8ce10dac8 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
automerge: ca27fb9

* commit 'ca27fb9711f24df8b88a41c8a360f57c7252ba79':
  docs: studio revision 21 update
 2014-12-17 17:42:19 +00:00
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
 2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
 2014-12-17 17:39:45 +00:00
Joe Fernandez
df916a89fe Merge "docs: studio revision 21 update" into lmp-docs 2014-12-17 02:21:50 +00:00
Joe Fernandez
80287e768f Merge "docs: studio tools help monkey update" into lmp-docs 2014-12-17 02:20:15 +00:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
Sarah Maddox
2f39dd777f am 91a41ac1: am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '91a41ac173b2515bbd110ab3bfc0f95bc25bfc8e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 11:02:44 +00:00
smain@google.com
87e74132bf am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit 'eb9a46075f13cb0c0ffbb1dd9cf935fd694f1b76':
  brute force improve suggestions for sdk download
 2014-12-16 11:02:38 +00:00
Narayan Kamath
d02a898528 resolved conflicts for merge of f44fdaed to master 
Change-Id: I324b252123b7fc4a38aad9be4b986cb564a17b14
 2014-12-16 10:57:05 +00:00
smain@google.com
5eb5d9f712 am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
automerge: b1eb5c9

* commit 'b1eb5c97d6601cd57378e17c2e6d9e75d0cea52c':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:39:25 +00:00
Joe Fernandez
ac45fe9fb5 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
automerge: 11341c4

* commit '11341c4d32c76e32a2df22a166085e6ede2fcdc7':
  docs: uiautomator blog link removal
 2014-12-16 02:38:19 +00:00
Joe Fernandez
7e5e1ccdad am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
automerge: d6bba15

* commit 'd6bba15c032270f9545b20cbf6fa8792559ce1fb':
  docs: studio basics typo
 2014-12-16 02:37:07 +00:00
Luan Nguyen
63e6d11224 am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
automerge: 56102be

* commit '56102be8922e888a2eb42a97e5977d17e63e16aa':
  docs: Add two new general functionality requirements
 2014-12-16 02:35:45 +00:00
Sarah Maddox
91a41ac173 am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '99c5ac9e14db60abb8186c4737803b4cf90c1dc0':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 02:31:39 +00:00
smain@google.com
eb9a46075f am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit '1d97aebdd96105fd0b24587406acbedec451a5ad':
  brute force improve suggestions for sdk download
 2014-12-16 02:31:34 +00:00
Rich Slogar
f44fdaedbf am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5 
* commit 'ccaf3552e62bb7ef2373bd4c282d275a209b7d91':
  docs: studio 1.0.1 revision update
 2014-12-16 02:31:29 +00:00
smain@google.com
b1eb5c97d6 am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
* commit 'f912c21e4325c87798ae6930ca734fb18636f9e5':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:31:23 +00:00
Joe Fernandez
11341c4d32 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
  docs: uiautomator blog link removal
 2014-12-16 02:31:17 +00:00
Joe Fernandez
d6bba15c03 am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
  docs: studio basics typo
 2014-12-16 02:23:24 +00:00
Luan Nguyen
56102be892 am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
  docs: Add two new general functionality requirements
 2014-12-16 02:23:17 +00:00
Sarah Maddox
48f9c8e48c am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899 am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
  brute force improve suggestions for sdk download
 2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
 2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
 2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
 2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Sarah Maddox
a158abe454 Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 2014-12-15 20:42:40 +00:00
Rich Slogar
c819d3df86 docs: studio revision 21 update 
Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20
 2014-12-15 10:46:18 -08:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
smain@google.com
0baa12cee3 Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6" 2014-12-15 15:56:55 +00:00
smain@google.com
5d0766a80e followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6 
Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994
 2014-12-15 07:39:52 -08:00
Sarah Maddox
65dc25da3f docs: Updates lesson 1 of location API training: Get last-known location. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
 2014-12-15 16:55:36 +11:00