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

2033 Commits

Author SHA1 Message Date
Katarina Stenstedt
9d13eec498 am e9b7d2f9: am d4fa96ea: am 399fc263: Merge change If30c5e20 into eclair 
Merge commit 'e9b7d2f92479a51625d24425742be3d176a8c046'

* commit 'e9b7d2f92479a51625d24425742be3d176a8c046':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
 2009-10-14 11:08:11 -07:00
Katarina Stenstedt
e9b7d2f924 am d4fa96ea: am 399fc263: Merge change If30c5e20 into eclair 
Merge commit 'd4fa96eab34c6141dc9ea832e727ad83e4f8b34d' into eclair-mr2-plus-aosp

* commit 'd4fa96eab34c6141dc9ea832e727ad83e4f8b34d':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
 2009-10-14 10:11:04 -07:00
Katarina Stenstedt
8b80c3e5c0 am 399fc263: Merge change If30c5e20 into eclair 
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-plus-aosp

* commit '399fc2636f1332986f319df3cf8ae56344070c51':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
 2009-10-14 10:08:42 -07:00
Katarina Stenstedt
d1f3d4e829 SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial. 
Changed image links to use @docRoot.

Change-id: If30c5e20bbbb0dd4a6eb0563ede2767d110e1c2e
Bug: 2158141
 2009-10-12 16:17:42 -07:00
Scott Main
6a48fccce2 am dd964993: am f80e7d9c: am 60d8b780: Merge change 27064 into donut 
Merge commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0'

* commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0':
  docs only.
 2009-09-27 15:43:20 -07:00
Scott Main
dd9649931f am f80e7d9c: am 60d8b780: Merge change 27064 into donut 
Merge commit 'f80e7d9cca1730506599ded8e32064e86b51344f' into eclair-plus-aosp

* commit 'f80e7d9cca1730506599ded8e32064e86b51344f':
  docs only.
 2009-09-25 18:03:11 -07:00
Scott Main
f80e7d9cca am 60d8b780: Merge change 27064 into donut 
Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair

* commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b':
  docs only.
 2009-09-25 17:58:05 -07:00
Scott Main
16a6e86d36 docs only. 
add information on provisional api level
and fix some link titles

Change-Id: If208ff3fc4bb169049484311422f772334c0ef1b
 2009-09-25 17:04:04 -07:00
Scott Main
08cfb5a201 am 4d4ef4e0: am 9762ff45: am c7d1ee8b: docs only. add new Updating Your SDK doc; update the \'android\' tool documentation. 
Merge commit '4d4ef4e02e9dd1cc54bf1db19f96adc01508308d'

* commit '4d4ef4e02e9dd1cc54bf1db19f96adc01508308d':
  docs only.
 2009-09-25 11:17:09 -07:00
Katarina Stenstedt
e194c5f35d am ca190523: am dc884053: am 20972da0: New localization document and tutorial 
Merge commit 'ca190523d1f19df0b6850908cd422cd7797c0d23'

* commit 'ca190523d1f19df0b6850908cd422cd7797c0d23':
  New localization document and tutorial
 2009-09-25 11:17:02 -07:00
Scott Main
4d4ef4e02e am 9762ff45: am c7d1ee8b: docs only. add new Updating Your SDK doc; update the \'android\' tool documentation. 
Merge commit '9762ff450dc9d83286d48558e327cf6b48c856ea' into eclair-plus-aosp

* commit '9762ff450dc9d83286d48558e327cf6b48c856ea':
  docs only.
 2009-09-24 20:38:40 -07:00
Katarina Stenstedt
ca190523d1 am dc884053: am 20972da0: New localization document and tutorial 
Merge commit 'dc884053ed0087c2d71038f4e3d35c12d7ec8348' into eclair-plus-aosp

* commit 'dc884053ed0087c2d71038f4e3d35c12d7ec8348':
  New localization document and tutorial
 2009-09-24 20:38:35 -07:00
Scott Main
9762ff450d am c7d1ee8b: docs only. add new Updating Your SDK doc; update the \'android\' tool documentation. 
Merge commit 'c7d1ee8b235fa947c6223d1a28363c269c5ae771' into eclair

* commit 'c7d1ee8b235fa947c6223d1a28363c269c5ae771':
  docs only.
 2009-09-24 20:33:47 -07:00
Katarina Stenstedt
dc884053ed am 20972da0: New localization document and tutorial 
Merge commit '20972da079adb6e53fe5f8758aa473d9d46a1b54' into eclair

* commit '20972da079adb6e53fe5f8758aa473d9d46a1b54':
  New localization document and tutorial
 2009-09-24 20:33:34 -07:00
Scott Main
c7d1ee8b23 docs only. 
add new Updating Your SDK doc;
update the 'android' tool documentation.

Change-Id: I14fc78da2e198069defd7d83097f5cb685e0f677
 2009-09-24 20:11:25 -07:00
Katarina Stenstedt
20972da079 New localization document and tutorial 
Adding a new Localization doc and Hello Localization tutorial, along
with graphics. Updating the left-nav to include these two documents.
Moved images into /images folder. Changed to max linewidth of 80.
 2009-09-21 17:31:03 -07:00
Dianne Hackborn
31612db5f5 am 10bedaaf: am 7fc39b26: Merge change 25238 into eclair 
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'

* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
  Implement issue #1780928: Need support hiding nav keys.
 2009-09-17 09:51:33 -07:00
Scott Main
746f131cde am 942c02a6: am bc663a65: am 528954c4: docs only. fix sample code errors per bug 2115299 
Merge commit '942c02a6c14d5e21473fb47618ea8b6b94c617e6'

* commit '942c02a6c14d5e21473fb47618ea8b6b94c617e6':
  docs only.
 2009-09-17 06:40:05 -07:00
Jean-Baptiste Queru
b1bf64ab7c am 7472788a: merge from open-source master 
Merge commit '7472788a87f8cc758cd534d960d178a1481c4cfb'

* commit '7472788a87f8cc758cd534d960d178a1481c4cfb':
  Text specifies "android:codeName" which doesnt exist, should be "android:versionName"
 2009-09-17 05:27:05 -07:00
Dianne Hackborn
10bedaaf3e am 7fc39b26: Merge change 25238 into eclair 
Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp

* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
  Implement issue #1780928: Need support hiding nav keys.
 2009-09-15 23:11:35 -07:00
Dianne Hackborn
93e462b79d Implement issue #1780928: Need support hiding nav keys. 
This implements support for devices whose hardware can hide
their navigation keys.  It works much like the existing keyboardHidden
configuration, and for compatibility uses the same configuration
change bit.

Also add FLAG_TURN_ON_SCREEN for windows, which has the system
cause the screen to be turned on when the window is displayed.
Great fun when used with FLAG_SHOW_WHEN_LOCKED!

Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
 2009-09-15 22:50:40 -07:00
Scott Main
942c02a6c1 am bc663a65: am 528954c4: docs only. fix sample code errors per bug 2115299 
Merge commit 'bc663a65315e6eab9d92316072250ea9efc9f18a' into eclair-plus-aosp

* commit 'bc663a65315e6eab9d92316072250ea9efc9f18a':
  docs only.
 2009-09-15 13:47:06 -07:00
Scott Main
bc663a6531 am 528954c4: docs only. fix sample code errors per bug 2115299 
Merge commit '528954c4d63980c0515528624130477f921cbc60' into eclair

* commit '528954c4d63980c0515528624130477f921cbc60':
  docs only.
 2009-09-15 13:18:34 -07:00
Scott Main
61e9cee40e am 7937966f: am a1103f33: am 890175db: Merge change 24574 into donut 
Merge commit '7937966f4bd28cf88bf24c5ac7debdc18de567db'

* commit '7937966f4bd28cf88bf24c5ac7debdc18de567db':
  docs only.
 2009-09-15 13:12:58 -07:00
Dirk Dougherty
b3e1b3fe74 am 37f62206: am 40351ece: am 7350ff3d: Merge change 24631 into donut 
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'

* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-15 13:12:51 -07:00
Jean-Baptiste Queru
7472788a87 merge from open-source master 2009-09-15 07:52:09 -07:00
Android Code Review
f9d9cf1ec1 Merge change 10322 
* changes:
  Text specifies "android:codeName" which doesnt exist, should be "android:versionName"
 2009-09-14 14:19:56 -07:00
Scott Main
528954c4d6 docs only. 
fix sample code errors per bug 2115299

Change-Id: Ie0e614b0b8fdb0ec744db288042ab1f484f52bfd
 2009-09-11 14:14:36 -07:00
Scott Main
7937966f4b am a1103f33: am 890175db: Merge change 24574 into donut 
Merge commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69' into eclair-plus-aosp

* commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69':
  docs only.
 2009-09-11 09:41:12 -07:00
Dirk Dougherty
37f6220623 am 40351ece: am 7350ff3d: Merge change 24631 into donut 
Merge commit '40351ecec878910d7f0ac6988cd8010dc82b0a99' into eclair-plus-aosp

* commit '40351ecec878910d7f0ac6988cd8010dc82b0a99':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 09:32:43 -07:00
Scott Main
a1103f336d am 890175db: Merge change 24574 into donut 
Merge commit '890175db1f425cb92365cc7941c6c64544b2c164' into eclair

* commit '890175db1f425cb92365cc7941c6c64544b2c164':
  docs only.
 2009-09-11 09:32:19 -07:00
Android (Google) Code Review
890175db1f Merge change 24574 into donut 
* changes:
  docs only. revise the maxSdkVersion description
 2009-09-11 12:27:30 -04:00
Dirk Dougherty
40351ecec8 am 7350ff3d: Merge change 24631 into donut 
Merge commit '7350ff3d572624abb5a46c3c4969e0b91cb05109' into eclair

* commit '7350ff3d572624abb5a46c3c4969e0b91cb05109':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 09:25:45 -07:00
Android (Google) Code Review
7350ff3d57 Merge change 24631 into donut 
* changes:
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 12:19:28 -04:00
Scott Main
026869f68b am 98a578c9: am f65bc182: am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue... 
Merge commit '98a578c9f88f0eae376cc21074d894c6bd87137c'

* commit '98a578c9f88f0eae376cc21074d894c6bd87137c':
  docs only.
 2009-09-10 19:47:41 -07:00
Scott Main
98a578c9f8 am f65bc182: am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue... 
Merge commit 'f65bc1823a8c09caab8237bf96323cf05df02287' into eclair-plus-aosp

* commit 'f65bc1823a8c09caab8237bf96323cf05df02287':
  docs only.
 2009-09-10 19:42:07 -07:00
Scott Main
f65bc1823a am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue... 
Merge commit 'd27b10837525f341eee7d46013e2177b0bad3c60' into eclair

* commit 'd27b10837525f341eee7d46013e2177b0bad3c60':
  docs only.
 2009-09-10 19:33:56 -07:00
Scott Main
d27b108375 docs only. 
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...

Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
 2009-09-10 19:22:48 -07:00
Dirk Dougherty
4c8a16a439 Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron. 
Change-Id: I24a0c3cb5c15e3725fecb5c64d8aa6de17c76cbd
 2009-09-10 18:23:12 -07:00
Scott Main
d56760ce1e docs only. 
revise the maxSdkVersion description

Change-Id: Id71f685fad5d08abc5c07af35edf49f0aa8b0914
 2009-09-10 17:39:37 -07:00
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Scott Main
88ffe75acd resolved conflicts for merge of 438fdfe8 to master 2009-09-03 09:41:39 -07:00
Scott Main
438fdfe833 am 8f99b524: am b6b25d63: Merge change 23126 into donut 
Merge commit '8f99b52484369a3a9221733c9817f6c09ba1ec85' into eclair-plus-aosp

* commit '8f99b52484369a3a9221733c9817f6c09ba1ec85':
  docs only.
 2009-09-02 20:24:09 -07:00
Scott Main
8f99b52484 am b6b25d63: Merge change 23126 into donut 
Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair

* commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1':
  docs only.
 2009-09-02 20:21:42 -07:00
Android (Google) Code Review
b6b25d63df Merge change 23126 into donut 
* changes:
  docs only. add documentation about zipalign and new auto-signing procedures for Ant
 2009-09-02 20:19:39 -07:00
Scott Main
23110e49b3 docs only. 
add documentation about zipalign and new auto-signing
procedures for Ant

Change-Id: Ia66f5a7af58f77e52b3a5c26cb9972d317c2c42c
 2009-09-02 20:17:16 -07:00
Dirk Dougherty
098b19112e am 2fcba612: am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake. 
Merge commit '2fcba6125ff9f3b8d8d555e20775f4bed0462029'

* commit '2fcba6125ff9f3b8d8d555e20775f4bed0462029':
  Add docs for SDK update.
 2009-09-02 19:18:57 -07:00
Dirk Dougherty
2fcba6125f am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake. 
Merge commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7' into eclair-plus-aosp

* commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7':
  Add docs for SDK update.
 2009-09-02 19:16:26 -07:00
Dirk Dougherty
618ded26c6 am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake. 
Merge commit 'a6602f1fe4590e48c760f21ce29a92629240c463' into eclair

* commit 'a6602f1fe4590e48c760f21ce29a92629240c463':
  Add docs for SDK update.
 2009-09-02 19:14:24 -07:00
Dirk Dougherty
a6602f1fe4 Add docs for SDK update. 
Add redirects for preview files.
Manually integrate a few doc changes from cupcake.

Change-Id:I524d7dbf929371ee501599229894640660f352ce
 2009-09-02 19:08:28 -07:00