summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Group revert of the following commits for design docs:"Peter Ng2012-08-0775-279/+723
| | | | This reverts commit c9506415d533c61a9607c5b61a1993747bafb406.
* Merge "docs: fix hdef variable" into jb-devScott Main2012-08-071-2/+4
|\
| * docs: fix hdef variableScott Main2012-08-071-2/+4
| | | | | | | | Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
* | docs: fix broken linksScott Main2012-08-066-5031/+5025
|/ | | | | | and update sitemap text file Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
* Merge "docs: add downloads directory with initial set of current files. This ↵Scott Main2012-08-0622-0/+9
|\ | | | | | | directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage." into jb-dev
| * docs: add downloads directory with initial set of current files.Scott Main2012-07-3122-0/+9
| | | | | | | | | | | | | | | | This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage. Change-Id: I181438f9ec4513cf2e49455803bbe434c8f29d36
* | misc doc bugs.Scott Main2012-08-066-18/+19
| | | | | | | | | | | | | | | | | | | | | | Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
* | Fix a logging NPE problemRobert Greenwalt2012-08-021-1/+2
| | | | | | | | | | bug:6864064 Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
* | Merge "Notification panel on tablet does not handle back and home key ↵Svetoslav Ganov2012-08-021-1/+22
|\ \ | | | | | | | | | events." into jb-dev
| * | Notification panel on tablet does not handle back and home key events.Svetoslav Ganov2012-08-021-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Notification panel on tablet does not handle back and home key events and as a result the notification panel stays open. Hence, after opening the notifications panel, pressing the back key on a keyboard will move back in the app instead closing the panel. Same happens for the home key. The expected behavior is if the panel is open the back button will dismiss it and the key should be consumed by the panel. The home key should hide the panel and the key should not be consumed by the panel so the system can do the right thing. bug:6902903 Change-Id: I06e8ceea1f51b998e6703d70dcb3a24128d5a581
* | | Merge "Doc change: add trademarks attribution." into jb-devDirk Dougherty2012-08-021-5/+6
|\ \ \
| * | | Doc change: add trademarks attribution.Dirk Dougherty2012-08-021-5/+6
| | | | | | | | | | | | | | | | Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
* | | | Merge "fix markup for gl pie" into jb-devScott Main2012-08-011-1/+1
|\ \ \ \
| * | | | fix markup for gl pieScott Main2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
* | | | | Merge changes I9bd42a8a,I613d0b12 into jb-devKatie McCormick2012-08-012-8/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 Doc update: Misc minor GCM updates.
| * | | | | cherrypick from master docs: GCM changes Change-Id: ↵Katie McCormick2012-08-011-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Id5454e70455bae14ab4605021a6c1bcab0292ae9 Conflicts: docs/html/guide/google/gcm/gcm.jd Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
| * | | | | Doc update: Misc minor GCM updates.Katie McCormick2012-08-012-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 Conflicts: docs/html/guide/google/gcm/gcm.jd
* | | | | | Merge "Doc change: 4K -> 4kb" into jb-devKatie McCormick2012-08-011-1/+1
|\ \ \ \ \ \
| * | | | | | Doc change: 4K -> 4kbKatie McCormick2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
* | | | | | | Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: ↵Katie McCormick2012-08-011-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev
| * | | | | | | cherrypick from master docs: Battery class C2DM -> GCM Change-Id: ↵Katie McCormick2012-08-011-6/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If5fe0034ae0bb72c321b591f84e79acbaf2e36f1 Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
* | | | | | | Group revert of the following commits for design docs:Scott Main2012-08-0175-723/+279
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce470e17fd4298c1b8aa9a5fd7493bde7a6be840 8874ab0473f4db10e71bf0537c0703db03bac4ee bdd8d0fada73dabbda7f6f174c17317d1e30a79e 6443ca4cd9406ed8e9ba55461d4b2eb677aad17a 5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e 1edd4ae5c4748bd9d1e64f65dc554790063d59b8 be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff 6a681afd38d9881154207436e5e145856e9d2f75 353474c0acdad9b8ffdb86d3d5f32137885dd720 2b1584c1d53cd1070d5157c07158828b4baf8844 Had to revert these because they're not ready to be published. Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
* | | | | | new confirming page and updates to progress and iconographyPeter Ng2012-08-0123-105/+248
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
* | | | | Merge "Add missing docs to notification style rebuilder functions." into jb-devChris Wren2012-08-011-0/+10
|\ \ \ \ \
| * | | | | Add missing docs to notification style rebuilder functions.Chris Wren2012-08-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6914726 Change-Id: I13efae036610523ec6f83696d3337054e79856aa
* | | | | | Merge "dashboard update for 8/1" into jb-devScott Main2012-08-011-28/+28
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | dashboard update for 8/1Scott Main2012-08-011-28/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
* | | | | Merge "docs: Add Device Art Generator for Nexus devices to ↵Roman Nurik2012-08-0130-0/+519
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | d.a.c/distribute." into jb-dev
| * | | | | docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.Roman Nurik2012-08-0130-0/+519
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this code is adapted from my code.google.com/p/android-ui-utils project. Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
* | | | | | Merge "fix more broken links" into jb-devScott Main2012-08-0113-54/+35
|\ \ \ \ \ \
| * | | | | | fix more broken linksScott Main2012-07-3113-54/+35
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: If4dceab223a6c22827a0645aa5923ddc427b2b85
* | | | | | Merge "moving accessibility image to callouts" into jb-devPeter Ng2012-07-312-1/+20
|\ \ \ \ \ \
| * | | | | | moving accessibility image to calloutsPeter Ng2012-07-312-1/+20
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: Ia67240a5eced57803d4593269a509b28fe2ecf9c
* | | | | | Merge "new extras section linking to design talks" into jb-devPeter Ng2012-07-313-0/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | new extras section linking to design talksPeter Ng2012-07-313-0/+26
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ia16fb1a90f4f8e3d42dea978e17cea0ed6cd107e
* | | | | docs: fix broken linksScott Main2012-07-3138-88/+63
|/ / / / | | | | | | | | | | | | Change-Id: I0523fb8eb8608b07cf7ca866d0c2ccfcbfc2e946
* | | | Merge "Fix AccountManagerServiceTest" into jb-devKenny Root2012-07-311-0/+4
|\ \ \ \
| * | | | Fix AccountManagerServiceTestKenny Root2012-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MockAccountAuthenticatorCache needs to implement the new method. Bug: 6820670 Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
* | | | | Merge "Initial commit of wireless connectivity/discovery class." into jb-devAlexander Lucas2012-07-316-0/+1080
|\ \ \ \ \
| * | | | | Initial commit of wireless connectivity/discovery class.Alexander Lucas2012-07-316-0/+1080
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbcbb8f5021a749ddb131d678ee1117835168598
* | | | | | Merge "Delay AccountManagerService initialization" into jb-devKenny Root2012-07-315-7/+34
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Delay AccountManagerService initializationKenny Root2012-07-305-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since applications can have Account providers, they need to be delayed until after PackageManagerService says everything is mounted. Otherwise the accounts associated with that provider will be removed immediately when startup happens. Bug: 6820670 Change-Id: Iba81765260421649f706624d0605a40ebc1347b1
* | | | | Merge "removing recents icon in tabs ss" into jb-devPeter Ng2012-07-311-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | removing recents icon in tabs ssPeter Ng2012-07-311-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3a8b3b33c9c90bb8a0ee28e502bbdbe3e72e62be
* | | | | Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-devBrian Carlstrom2012-07-312-22/+46
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Change KeyStore to use Modified UTF-8 to match NativeCryptoBrian Carlstrom2012-07-302-22/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=35141 Bug: 6869713 Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
* | | | Merge "help image updates" into jb-devPeter Ng2012-07-317-23/+19
|\ \ \ \
| * | | | help image updatesPeter Ng2012-07-307-23/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I4357879eb365f5584efb838139132fd9f7a6e1be
* | | | | Merge "new accessibility section" into jb-devPeter Ng2012-07-313-0/+62
|\ \ \ \ \
| * | | | | new accessibility sectionPeter Ng2012-07-303-0/+62
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I15fdc9550c9bf414f003685748f5aff71a9b4d44