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

7248 Commits

Author SHA1 Message Date
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Ricardo Cervera
652e5c7ef1 Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 2014-07-28 18:28:56 +00:00
Ricardo Cervera
321e030202 docs: Fix Wear docs issues. 
Bug: 16624918
Bug: 16626217
Bug: 16626415
Bug: 16624384
Bug: 16623147

Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
 2014-07-28 17:52:40 +00:00
Robert Ly
9613b433f4 Merge "docs: fix typo" into klp-modular-docs 2014-07-25 21:16:23 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Ricardo Cervera
6c555824eb docs: Describe the alloc tracker in Android Studio 
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
 2014-07-25 08:32:15 -07:00
Ricardo Cervera
0f1e067a28 am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '472e234d807df490124263c1e28c66e1918787c9':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-23 23:12:15 +00:00
Ricardo Cervera
472e234d80 am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '7af4e812d06d7174e9eb677a508c6af0f3ba3608':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-23 23:08:10 +00:00
Ricardo Cervera
7af4e812d0 docs: Fixed RecyclerView example. Bug: 16483811 
Change-Id: I1c501c97026dfaaac88d7398160ff192fee4fb05
 2014-07-23 15:56:10 -07:00
Scott Rowe
162493b5e3 am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '3bb44fecbb9643e68a52d19b9c90809c77367b3e':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-23 21:06:36 +00:00
Scott Rowe
3bb44fecbb am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '72c80d308a88d59347f13dd813f2885bc4f45acc':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-23 21:02:09 +00:00
Scott Rowe
72c80d308a cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e
 2014-07-23 20:49:45 +00:00
David Friedman
42dbe80914 am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +00:00
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00
Scott Rowe
6b2f3ee3b9 am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:08:02 +00:00
Scott Rowe
2a922cb45a am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:03:19 +00:00
Andrew Solovay
3a14c2890e am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:47:26 +00:00
Andrew Solovay
a2beba70b9 am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:41:21 +00:00
Robert Ly
47495df6a6 am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit 'fb8e254a1a66fc707a1c52d4cced699339f15685':
  docs: update links and add new wear design materials
 2014-07-22 17:18:52 +00:00
Robert Ly
817a31afa3 am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc 
* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
  docs: remove android translation plugin doc
 2014-07-22 17:18:47 +00:00
Robert Ly
fb8e254a1a am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
  docs: update links and add new wear design materials
 2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179 am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
  docs: remove android translation plugin doc
 2014-07-22 17:12:10 +00:00
Robert Ly
0b5f9c2f68 docs: remove android translation plugin doc 
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
 2014-07-22 17:07:12 +00:00
Robert Ly
1c723ea84e Merge "docs: update links and add new wear design materials" into klp-modular-docs 2014-07-22 16:21:19 +00:00
Robert Ly
faaf23b9ac docs: update links and add new wear design materials 
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
 2014-07-22 10:06:31 -07:00
Robert Ly
c57c082983 Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 2014-07-22 16:13:36 +00:00
Dirk Dougherty
b2902ee380 Doc change: add reminder for developers on using ad id. 
Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
 2014-07-22 20:41:57 +00:00
David Friedman
170b09535d Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 2014-07-22 16:13:36 +00:00
Robert Ly
c8551e678b am 4f67e66e: am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit '4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
  docs: fix speech code for bug 16461337
 2014-07-22 14:34:06 +00:00
Robert Ly
4f67e66e3e am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit 'f3be7864a6cf1b98107de1eadf25587b53a90fca':
  docs: fix speech code for bug 16461337
 2014-07-22 14:30:13 +00:00
David Friedman
86efa014fc Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body. 
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
 2014-07-22 00:22:00 -07:00
Dirk Dougherty
b810999637 am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'd1929c505a66afc13d661beac9868f2886cbd1e8':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:58:13 +00:00
Dirk Dougherty
d1929c505a am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id. 
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
 2014-07-21 22:15:04 +00:00
Andrew Solovay
30aa5924f0 am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:47:13 +00:00
Ricardo Cervera
fef0011144 am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9 am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:07:00 +00:00
Robert Ly
205196f128 am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
  docs: change copy for edu video
 2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa am 62c81ab5: docs: change copy for edu video 
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video
 2014-07-21 16:11:39 +00:00
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -07:00
Ricardo Cervera
940ae93043 Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e docs: Added note suggesting use of Android Studio over ADT 
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
 2014-07-21 09:08:10 -07:00
Robert Ly
f3be7864a6 Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 2014-07-21 15:42:19 +00:00
Robert Ly
61ecfc3428 docs: fix speech code for bug 16461337 
Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
 2014-07-22 14:25:10 +00:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00