summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
* am 939a3dd4: am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN ↵Chia-chi Yeh2011-12-022-0/+10
|\ | | | | | | | | | | | | sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '939a3dd4e7e2282786a8c5270855b611317ad241': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
| * am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging ↵Chia-chi Yeh2011-12-022-0/+10
| |\ | | | | | | | | | | | | | | | | | | server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '431c3e4c7e2103865a90501a552b4e5145ed3f35': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
| | * Merge "Documentation for the VPN sample for ICS SDK. Staging server: ↵Chia-chi Yeh2011-12-022-0/+10
| | |\ | | | | | | | | | | | | http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
| | | * Documentation for the VPN sample for ICS SDK.Fred Chung2011-11-282-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html Change-Id: I35a17374fc0d9d165cedc9d6e1052eaec0028ace
| * | | am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ↵Roman Nurik2011-12-021-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a': Reduce file size for ADL presentation shareable.
| | * | Merge "Reduce file size for ADL presentation shareable." into ics-mr0Roman Nurik2011-12-021-0/+0
| | |\ \
| | | * | Reduce file size for ADL presentation shareable.Roman Nurik2011-12-021-0/+0
| | | |/ | | | | | | | | | | | | Change-Id: I700959f3c15609c730c63d99953b890a93105cea
* | | | am aeda641e: am a7d825dd: am c3998ced: Merge "Update widget design ↵Roman Nurik2011-12-012-7/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | guidelines for padding and 8dp." into ics-mr0 * commit 'aeda641e331e86f86b19493f9e5c1be38a45f5db': Update widget design guidelines for padding and 8dp.
| * | | am c3998ced: Merge "Update widget design guidelines for padding and 8dp." ↵Roman Nurik2011-12-012-7/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e': Update widget design guidelines for padding and 8dp.
| | * | Merge "Update widget design guidelines for padding and 8dp." into ics-mr0Roman Nurik2011-12-012-7/+9
| | |\ \
| | | * | Update widget design guidelines for padding and 8dp.Roman Nurik2011-12-012-7/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using layout_margin for widget margins, the recommendation is to now use padding. Additionally, update all docs to mention an example default padding of 8dp instead of 15 or 16dp. Change-Id: I330aedc56986dbb31a70260279ad2f6668c67c92
* | | | am 92a2f5fd: am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ↵Bill Gruber2011-12-013-25/+250
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 * commit '92a2f5fd6a8e423d6c9ef5b42c576a2ce7e900a2': Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
| * | | am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: ↵Bill Gruber2011-12-013-25/+250
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 * commit '92ad16d342aa4d39bad33600161b3799b84716f3': Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
| | * | Merge "Cherrypick from HCMR2 Change ID: ↵Bill Gruber2011-12-013-25/+250
| | |\ \ | | | | | | | | | | | | | | | Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
| | | * | Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8Bill Gruber2011-12-013-25/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAB doc update: CSV import feature Also fixed Bug 5221766 Change-Id: I40b8057dae10067c8cc9aa7506564c0033efc2fe
* | | | | am 42e4ecc7: am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for ↵Scott Main2011-12-013-21/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 12/1" into ics-mr0 * commit '42e4ecc7277bb568971c701e14ac2f97da7b4d02': docs: dashboard update for 12/1
| * | | | am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0Scott Main2011-12-013-21/+21
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8f3993b12b52ac5d94d84376ec4f42b130018429': docs: dashboard update for 12/1
| | * | | Merge "docs: dashboard update for 12/1" into ics-mr0Scott Main2011-12-013-21/+21
| | |\ \ \ | | | |/ / | | |/| |
| | | * | docs: dashboard update for 12/1Scott Main2011-12-013-21/+21
| | | |/ | | | | | | | | | | | | Change-Id: If5323832093a90cf151f4103df810281687407d0
* | | | am 075bd9eb: am 4f926932: am acf1038a: docs: remove broken link from ↵Scott Main2011-12-011-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | renderscript docs bug: 5696178 * commit '075bd9eb93449fb0a5c6da1379e11f51f8379794': docs: remove broken link from renderscript docs bug: 5696178
| * | | am acf1038a: docs: remove broken link from renderscript docs bug: 5696178Scott Main2011-12-011-4/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'acf1038a260d7b2a3bb6b36058da47041c8ec173': docs: remove broken link from renderscript docs bug: 5696178
| | * | docs: remove broken link from renderscript docsScott Main2011-12-011-4/+3
| | |/ | | | | | | | | | | | | | | | bug: 5696178 Change-Id: I78285ac67749fb3936e359968d28bbeb539ea7dc
* | | am a181a919: am 37ac88f9: Merge "Update description of account_type" into ↵Michael Chan2011-11-231-5/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr1 * commit 'a181a9197c0affbcddd627c625c8064f494b94d6': Update description of account_type
| * | Update description of account_typeMichael Chan2011-11-211-5/+3
| | | | | | | | | | | | Change-Id: Id929b3a75f86aa79423a0fe0520204ac88502f5b
* | | Merge "Fix the backups example to use a simpler lock."Jesse Wilson2011-11-191-1/+1
|\ \ \
| * | | Fix the backups example to use a simpler lock.Jesse Wilson2011-11-181-1/+1
| | | | | | | | | | | | | | | | Change-Id: If9a78654b0d6bc25f0a04deb8020275e5b3d91ab
* | | | am 0c778cdd: am dea90a0e: am 366113fa: Merge "docs: Camera Features for ↵Joe Fernandez2011-11-183-16/+466
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | developers" into ics-mr0 * commit '0c778cdd9cfdb8007b15eef2eca91f3089590f98': docs: Camera Features for developers
| * | | am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0Joe Fernandez2011-11-183-16/+466
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '366113fa1bea5ef39cf6557f18ff00310eb6e458': docs: Camera Features for developers
| | * | Merge "docs: Camera Features for developers" into ics-mr0Joe Fernandez2011-11-173-16/+466
| | |\ \
| | | * | docs: Camera Features for developersJoe Fernandez2011-11-173-16/+466
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
* | | | | am e17a4a02: am d353df8d: am 48eaa6c9: docs: update caption for action bar ↵Scott Main2011-11-181-4/+5
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | figure to match new screenshot * commit 'e17a4a02617dbefbc870df8280ffa1cd82fff2a0': docs: update caption for action bar figure to match new screenshot
| * | | am 48eaa6c9: docs: update caption for action bar figure to match new screenshotScott Main2011-11-181-4/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b': docs: update caption for action bar figure to match new screenshot
| | * | docs: update caption for action bar figure to match new screenshotScott Main2011-11-171-4/+5
| | | | | | | | | | | | | | | | Change-Id: I233383ca7168ddb96231d3d22a5dcd6342462103
* | | | Remove untrue tip about zero-length arrays.Jesse Wilson2011-11-181-8/+0
| | | | | | | | | | | | | | | | Change-Id: I45ee2d603c1286c96acaa35d0c0fc28ecda47cef
* | | | am ff31a5b1: am 85c73948: am 08d40d71: Merge "docs: Big update to action bar ↵Scott Main2011-11-1713-443/+1057
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised * commit 'ff31a5b1566a7a3eaaf75fa67db11b8cadacf453': docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
| * | | am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added ↵Scott Main2011-11-1713-443/+1057
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio * commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3': docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
| | * | Merge "docs: Big update to action bar guide for ICS. Added section for ↵Scott Main2011-11-1713-443/+1057
| | |\ \ | | | | | | | | | | | | | | | action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0
| | | * | docs: Big update to action bar guide for ICS.Scott Main2011-11-1713-443/+1057
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917 Change-Id: If61a5f2aad5ed21b0b23b3fc14309a50617f86ce
* | | | | am dbda791f: am be0dab48: am 69e24843: Merge "Licensing docs: clarifies ↵Bill Gruber2011-11-171-10/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | server response for draft apps Bug 2900690" into ics-mr0 * commit 'dbda791f3a77449b023fe0062895510e95da73dd': Licensing docs: clarifies server response for draft apps Bug 2900690
| * | | | am 69e24843: Merge "Licensing docs: clarifies server response for draft apps ↵Bill Gruber2011-11-171-10/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2900690" into ics-mr0 * commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41': Licensing docs: clarifies server response for draft apps Bug 2900690
| | * | | Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" ↵Bill Gruber2011-11-171-10/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | into ics-mr0
| | | * | | Licensing docs: clarifies server response for draft appsBill Gruber2011-11-161-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2900690 Change-Id: Ibd1f14739e553bdc237fdb67322e43bef30dfd17
* | | | | | am 50c6dd0f: am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes ↵Bill Gruber2011-11-171-9/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | references to forward-locking Bug 3055286" into ics-mr0 * commit '50c6dd0fd5f7842bfbdc54ddbb134be883b52c41': Filters docs: removes references to forward-locking Bug 3055286
| * | | | | am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug ↵Bill Gruber2011-11-171-9/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3055286" into ics-mr0 * commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de': Filters docs: removes references to forward-locking Bug 3055286
| | * | | | Merge "Filters docs: removes references to forward-locking Bug 3055286" into ↵Bill Gruber2011-11-171-9/+9
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | ics-mr0
| | | * | | Filters docs: removes references to forward-lockingBill Gruber2011-11-161-9/+9
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3055286 Change-Id: Idb64984a1f3437749d9a865885bf4e0b258e60d3
* | | | | am 309643d9: am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '309643d93afd877b279acbe298b2258b62f67f53': docs: add sums/sizes for adt 15.0.1
| * | | | am 7d4c4721: docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '7d4c4721c6dd5473464d4620749b302a413c7ebd': docs: add sums/sizes for adt 15.0.1
| | * | | docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I9dc5e429c09cb31a86d1e867f76f4d3a3997dd87
| | * | | Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ↵Fred Chung2011-11-172-0/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0