Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,105 Commits 3 Branches 0 Tags
2d0010674aa5fc30ba48b83e8a9c035fdf38cfaf
Commit Graph

839 Commits

Author SHA1 Message Date
Robert Ly
d3f802c02f resolved conflicts for merge of c0b3ba83 to master 
Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99
 2011-02-02 16:08:23 -08:00
Robert Ly
c0b3ba83b2 resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp 
Change-Id: I407df4448a126a39128f3e24232c166be2625e14
 2011-02-02 14:04:20 -08:00
Robert Ly
5347a4b3e5 Doc change: fixing broken links/images 
Change-Id: I2e0fd99ec4badc234b88482d0c90b03d33fbdc30
 2011-02-02 11:54:28 -08:00
Dianne Hackborn
d78da53334 am 21e7ba24: am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '21e7ba2451fdbc3e69468222638d5ee99eb44c30':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:36:33 -08:00
Dianne Hackborn
21e7ba2451 am 15efe4cb: am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit '15efe4cb4c7d5bd19266ff740b1a3c8a703cd3a9':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-24 13:23:43 -08:00
Scott Main
4935bf26f7 am e634d346: am fa9d452b: Merge "update sidenav, fix typos" into honeycomb 
* commit 'e634d34696d7e7cf3d5de87d253ef5fd45ffe2ef':
  update sidenav, fix typos
 2011-01-21 18:53:39 -08:00
Scott Main
e634d34696 am fa9d452b: Merge "update sidenav, fix typos" into honeycomb 
* commit 'fa9d452b45a6c10666ff5d36bfbac8da37f33ac5':
  update sidenav, fix typos
 2011-01-21 18:51:04 -08:00
Scott Main
6027501a75 update sidenav, fix typos 
Change-Id: I9da574db1ee13f511a5557f6ce4559192afc67b3
 2011-01-21 18:48:09 -08:00
Scott Main
b91abcf814 am 6752e674: am 5b5cbbf8: Merge "Doc change: fixing links and code indents" into honeycomb 
* commit '6752e6747952fbc545e088aceaba9db131c19f94':
  Doc change: fixing links and code indents
 2011-01-21 16:23:33 -08:00
Scott Main
6752e67479 am 5b5cbbf8: Merge "Doc change: fixing links and code indents" into honeycomb 
* commit '5b5cbbf8570a81d3604d1260f559d9d543e8e4bf':
  Doc change: fixing links and code indents
 2011-01-21 16:21:57 -08:00
Scott Main
5b5cbbf857 Merge "Doc change: fixing links and code indents" into honeycomb 2011-01-21 16:19:56 -08:00
Robert Ly
070c84d9eb Doc change: fixing links and code indents 
Change-Id: I1fecaee28858c9b619ea41357c5313a7c39d6e13
 2011-01-21 12:02:07 -08:00
Scott Main
d368a35c44 am 535ad65e: am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits 
* commit '535ad65e543d724d177fb8e8175e120d571d804b':
  cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
 2011-01-21 10:58:30 -08:00
Scott Main
aa99dc6543 am 244c10b0: am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was n 
* commit '244c10b0d879d9373a1ad4b80ae71d5a35c762ba':
  cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
 2011-01-21 10:58:22 -08:00
Dianne Hackborn
15efe4cb4c am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 
* commit 'a8069f34f65bee858d87fd232a872a62e85a502b':
  Fixes Keyboard availability in "Providing Resources" documentation page.
 2011-01-21 09:55:16 -08:00
Keiji Ariyama
a84e088211 Fixes Keyboard availability in "Providing Resources" documentation page. 
Added keyshidden value.

Change-Id: I9fb1a06971488f446ccafdfa3b0db17786b33f97
 2011-01-22 01:58:25 +09:00
Scott Main
535ad65e54 am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits 
* commit '0f8056321f4d4552fb96a671c3cd194814ad0d4e':
  cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
 2011-01-20 21:42:23 -08:00
Scott Main
244c10b0d8 am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at 
* commit '77d6fcff7b97b53d7bf15557e117d32b95c21f63':
  cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
 2011-01-20 21:42:18 -08:00
Scott Main
0f8056321f cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 
docs: add OEM USB Drivers document
and update install guide with windows 7 procedures
misc style edits

Change-Id: Icadbfc1136463a75039f87e7c0cbc79d29afbd84
 2011-01-20 18:37:41 -08:00
Scott Main
77d6fcff7b cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 
docs: update supports-screens doc with xlargescreens attribute...
we updated the Supporting Multiple Screens document with this attribute
for gingerbread, but this document was not updated at that time.

Change-Id: I946e7eb8b93cee1a7223d400c882f415d6045815
 2011-01-20 18:33:51 -08:00
Adam Powell
1bc9e6cbb1 am 8bbec794: am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '8bbec794473f802d4d61613f77bc69a582e3fcc0':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:25:55 -08:00
Trevor Johns
a736c401c4 am fa7469ca: am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 
* commit 'fa7469cae8511bb2dc0e40dcb548f1b5957be52c':
  Fixing bugs in HelloWebView tutorial on developer.android.com.
 2011-01-20 17:25:33 -08:00
Adam Powell
8bbec79447 am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:06:35 -08:00
Trevor Johns
fa7469cae8 am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 
* commit '2ca4d8b7b97f20c8ad6897fc8c0c95616c0e80c6':
  Fixing bugs in HelloWebView tutorial on developer.android.com.
 2011-01-20 17:04:40 -08:00
Adam Powell
9c91c7e27f Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb 2011-01-20 14:39:56 -08:00
Adam Powell
1264c33163 Fix bug 3362375 - API REVIEW: remove unused public 'up' id 
Fix bug 3362453 - API REVIEW: android.app.ActionBar

Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a
 2011-01-20 13:25:08 -08:00
Trevor Johns
2ca4d8b7b9 Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb 2011-01-20 13:19:25 -08:00
Trevor Johns
b99d136f25 Fixing bugs in HelloWebView tutorial on developer.android.com. 
- Top-level LinearLayout needs to fill_parent, rather than wrap_content,
  otherwise the child WebView has 0 width
- setWebViewClient() needs to construct a new HelloWebViewClient, not
  WebViewClientDemo (which doens't exist).

Change-Id: Ie8b14e0cbf2b498573e965ccfc27b858dedabfa0
 2011-01-20 13:04:17 -08:00
Robert Ly
d9ce5c347e am e985c3a9: am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb 
* commit 'e985c3a9bdb5e7cb3dd7c3ea0894396717e83955':
  Doc change: animation devguide topic
 2011-01-19 22:14:01 -08:00
Robert Ly
e985c3a9bd am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb 
* commit '4c4332250d9e6d2cb746625cc232052561c4d450':
  Doc change: animation devguide topic
 2011-01-19 22:12:05 -08:00
Robert Ly
f99b782b9f Doc change: animation devguide topic 
Change-Id: I52cdd29616f7f30784c0f8352c035493c8d413dc
 2011-01-19 21:39:45 -08:00
Elliott Hughes
2b25dcc09d am b28c5ecc: am ea6a3c70: Merge "Minor updates." into honeycomb 
* commit 'b28c5eccabff5192d94fd59594123e8f9d450c1c':
  Minor updates.
 2011-01-18 22:00:14 -08:00
Elliott Hughes
b28c5eccab am ea6a3c70: Merge "Minor updates." into honeycomb 
* commit 'ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
  Minor updates.
 2011-01-18 18:39:36 -08:00
Elliott Hughes
ea6a3c706a Merge "Minor updates." into honeycomb 2011-01-18 17:25:05 -08:00
Elliott Hughes
c3839d3242 Minor updates. 
Take into account Gingerbread JIT and GC improvements.

Change-Id: I170def3ac1ecac0ba88258b8d6bfdd77cb2f7f9a
 2011-01-18 17:13:06 -08:00
Dianne Hackborn
44b628d2f6 am ad81f4ff: am f4c4b666: Merge "Remove old APIs." into honeycomb 
* commit 'ad81f4ffb8b8c32afea1a742dbb9bbc734b7a8a1':
  Remove old APIs.
 2011-01-18 07:52:19 -08:00
Dianne Hackborn
ad81f4ffb8 am f4c4b666: Merge "Remove old APIs." into honeycomb 
* commit 'f4c4b666234d0e5c510c846b13382b77175f10e1':
  Remove old APIs.
 2011-01-18 07:34:09 -08:00
Scott Main
9f7344477f am eb7dbc08: am a8e519a3: Merge "docs: move the fragments dev guide into fundamentals topic" into honeycomb 
* commit 'eb7dbc08be837ac1cc2280c6ed55d8db35c18048':
  docs: move the fragments dev guide into fundamentals topic
 2011-01-17 23:31:30 -08:00
Dianne Hackborn
17b9b81418 Remove old APIs. 
Change-Id: If676e4e7886ad71c4959d4253db99639b49218b8
 2011-01-17 17:16:02 -08:00
Scott Main
eb7dbc08be am a8e519a3: Merge "docs: move the fragments dev guide into fundamentals topic" into honeycomb 
* commit 'a8e519a32291e1d964d3de71fa291d7204ef52c7':
  docs: move the fragments dev guide into fundamentals topic
 2011-01-17 17:04:01 -08:00
Scott Main
1064dd9117 docs: move the fragments dev guide into fundamentals topic 
Change-Id: If6a9751e78db23e76256e179db99aa0e29126f85
 2011-01-17 16:06:12 -08:00
Scott Main
f5a3f10e52 am 40f956bd: am 168a0e90: Merge "docs: revise offline homepage; delete developing index redirect page" into honeycomb 
* commit '40f956bd3a732d7563e589ed9857f472f5a6911d':
  docs: revise offline homepage; delete developing index redirect page
 2011-01-17 15:14:15 -08:00
Scott Main
40f956bd3a am 168a0e90: Merge "docs: revise offline homepage; delete developing index redirect page" into honeycomb 
* commit '168a0e907d06a151678295585f063456d7bf01e5':
  docs: revise offline homepage; delete developing index redirect page
 2011-01-17 15:11:45 -08:00
Scott Main
e158413543 docs: revise offline homepage; delete developing index redirect page 
Change-Id: If73a0811721fa61c6924ac4aeaaa92c81c5fe439
 2011-01-17 14:48:15 -08:00
Scott Main
5c4f5f8873 am ab56c2ea: am 47cd4d52: Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb 
* commit 'ab56c2ea674bb35c23e4a44a54fdc5976afdea72':
  docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up
 2011-01-17 12:10:57 -08:00
Scott Main
ab56c2ea67 am 47cd4d52: Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb 
* commit '47cd4d521bf440042562b5cd1527facc4416b8dc':
  docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up
 2011-01-17 12:08:50 -08:00
Scott Main
04d0e3d188 docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up 
Change-Id: Ie5fb51d6a4109acec6dd403cde2b630df8724bba
 2011-01-16 21:36:42 -08:00
Scott Main
9fc8bea989 am 2150553d: cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs: 
* commit '2150553dc374204a1cb3033ed3fa65c2f22dd5e7':
  cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:
 2011-01-14 14:10:14 -08:00
Scott Main
2150553dc3 cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master 
docs: Rewrite of App Fundamentals.. Part 2.
This introduces three new docs:

Services:
  Provides an introduction to using services and describes the
  service lifecycle (previously in the "Component Lifecycles" section
  of the fundamentals.jd document)
Bound Services:
  A guide for services that offer binding.
AIDL:
  A doc about using AIDL (primarily for creating a service interface)

Also includes edits to IntentService javadocs to clarify
different behaviors for some callback methods

Includes a new version of the services lifecycle diagram
and an additional diagram for determining onRebind()

These files are orphaned for now---they're not linked in the sidenav,
until I get the last couple documents submitted for the app fundamentals.

Change-Id: I7fb0a8faff1f18b7d6b9a7b59f66f55a1b6168f1
 2011-01-14 14:07:29 -08:00
Scott Main
7024a313e4 resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp 
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
 2011-01-11 14:51:21 -08:00