Commit Graph

41104 Commits

Author SHA1 Message Date
Xavier Ducrohet
a001da3e59 am f8aea993: Make aapt ignore tools-related data.
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
2012-02-06 11:41:04 -08:00
Scott Main
a5b6218f47 am 633de7ba: docs: fix meta description tag for homepage
* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage
2012-02-01 15:12:40 -08:00
Scott Main
d27c50c6c1 am 6aaa27fb: docs: fix broken link
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
2012-02-01 15:00:30 -08:00
Scott Main
5a6982701c am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example
2012-02-01 13:52:21 -08:00
Scott Main
9ecc68d43b am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
  docs: dashboard update for feb 1
2012-02-01 13:52:19 -08:00
Scott Main
29ccacfaec am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 13:52:17 -08:00
Xia Wang
7c2858ed4a am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test
2012-02-01 13:52:13 -08:00
Scott Main
fa8e018073 Merge "docs: fix action bar style example" into ics-mr1 2012-02-01 11:54:57 -08:00
Scott Main
d6d4b9aa2f Merge "docs: dashboard update for feb 1" into ics-mr1 2012-02-01 11:43:48 -08:00
Xia Wang
6bd64dd226 Merge "Fix a typo in image processing test" into ics-mr1 2012-02-01 10:51:43 -08:00
The Android Open Source Project
e8308aa156 Reconcile with ics-mr1-release
Change-Id: I79900da9bc339bad1350124768b53026f465a345
2012-02-01 08:49:50 -08:00
Scott Main
e9a01c3838 Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1 2012-01-31 16:08:09 -08:00
The Android Automerger
91741bc2e6 merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:42:17 -08:00
Justin Ho
675fe24179 Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1 2012-01-31 14:00:55 -08:00
Scott Main
addfd725e7 Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 2012-01-31 08:39:36 -08:00
Scott Main
33e837a5de Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 2012-01-31 08:39:03 -08:00
Scott Main
0bd3b2ff51 Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1 2012-01-31 08:37:59 -08:00
The Android Automerger
50712688a6 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:37 -08:00
Scott Main
0aa8f39a3d Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1 2012-01-30 16:13:28 -08:00
The Android Automerger
14ccfc4a72 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:23:32 -08:00
Dianne Hackborn
2e6f082987 Merge "Update documentation to reflect the old approach not working." into ics-mr1 2012-01-30 12:52:11 -08:00
John Wang
a493ce1366 Merge "Adjust the LTE signal bar mapping." into ics-mr1 2012-01-30 11:20:35 -08:00
Scott Main
b11ef47140 Merge "docs: add G+ page announcement to homepage" into ics-mr1 2012-01-30 10:03:21 -08:00
The Android Automerger
e093eabe76 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:32:07 -08:00
Roman Nurik
716fa3cdcd Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Roman Nurik
4f237b4ce6 Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Daniel Sandler
e84ea3722f Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Scott Main
278a730b83 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
25120a84bb Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Joe Malin
0d9aecbbd8 am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
The Android Automerger
78d8cd87fa merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:08:57 -08:00
Robert Greenwalt
fa00205ed3 Merge "Filter our v6 address from tethering dns." into ics-mr1 2012-01-25 11:28:30 -08:00
Roman Nurik
1c4b467cf1 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
The Android Automerger
cdb6de20ee merge in ics-mr1-release history after reset to ics-mr1 2012-01-24 13:33:01 -08:00
Daniel Sandler
4ca203ab44 Merge "Stop showing "No internet connection" when there is one." into ics-mr1 2012-01-24 12:54:48 -08:00
Eric Laurent
46ae3f752e Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 2012-01-24 11:49:39 -08:00
Eric Laurent
95460d7cbc Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 2012-01-24 11:49:16 -08:00
Robert Greenwalt
4d5a59c80d Merge "Use the carrier-given dns addrs for tethering." into ics-mr1 2012-01-24 11:40:19 -08:00
Dianne Hackborn
8ee6be57f1 Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-24 11:33:15 -08:00
Dianne Hackborn
0545e6fcc8 Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1 2012-01-24 11:33:06 -08:00
Daniel Sandler
244d1b2cad Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1 2012-01-24 11:32:31 -08:00
Jim Miller
666b06d8f4 Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1 2012-01-23 15:49:32 -08:00
Justin Ho
7ebc940ec5 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
Bill Gruber
9432e6bfea Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Automerger
38418c2478 merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:12:47 -08:00
Jim Miller
27e1118292 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Justin Ho
4989420b27 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Justin Ho
849c08b732 Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -08:00
Dianne Hackborn
e2b2ee959a Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 2012-01-20 12:01:51 -08:00
Daniel Sandler
cec0a8e6a4 Merge "Always show appropriate mobile service label." into ics-mr1 2012-01-20 11:28:44 -08:00