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

89054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
68d0f32c09 am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '48f9f83ba27bf3a5cac224e30821836b3956c87c':
  docs: update adb tool page with am and pm reference
 2013-02-01 13:27:51 -08:00
Dirk Dougherty
f8a9c5090c am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '7b32d32bd38b423dd141e7ead89205b9b7929497':
  Add build rule for ds (devsite) online docs.
 2013-02-01 13:27:48 -08:00
Dirk Dougherty
d6e176c807 am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '2c1669c427826fba48ae7776e34f90cdcc5a3a20':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
 2013-02-01 13:27:35 -08:00
Adam Koch
3ef2c02654 am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000) 
# Via Adam Koch
* commit '376e707f65b3ee6e00953466d6367642d2a02b4b':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
 2013-02-01 13:27:26 -08:00
Dirk Dougherty
daf487fe22 am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava. 
# Via Dirk Dougherty
* commit 'df9fa4c602e986495fe8795fb800858b48693040':
  Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
 2013-02-01 13:27:19 -08:00
Scott Main
40c7b7a92f docs: delete orphaned images (the obvious ones) 
Change-Id: Ib6219e65a05925a13a26c415c69431bc2fbbdc68
 2013-02-01 11:57:01 -08:00
Xia Wang
2297d1e78c Merge "Fix WiFi test:" into jb-mr1.1-dev 2013-01-31 02:54:56 +00:00
Xia Wang
f2991add02 Fix WiFi test: 
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
    Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
    to avoid that, change the test to connect without scanning.

 -- Increase the timer to wait for WiFi to be connected

Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
 2013-01-30 18:52:27 -08:00
Scott Main
e55d5e864b docs: change "android developer console" to "developer console" 
Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935
 2013-01-30 15:54:18 -08:00
Scott Main
f216ded93a Merge "docs: clarify usage for adb am component option" into jb-mr1-dev 2013-01-30 23:17:56 +00:00
Scott Main
483d785b42 docs: clarify usage for adb am component option 
Change-Id: I0b99dffc0b9d465c3a639bd1f7760561e40e2a5f
 2013-01-30 15:16:10 -08:00
Fabrice Di Meglio
7bac3614ff Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev 2013-01-30 23:04:28 +00:00
Fabrice Di Meglio
a62dbfd953 Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE 
Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986
 2013-01-30 12:30:03 -08:00
Dirk Dougherty
2aa47b3362 Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev 2013-01-29 23:40:01 +00:00
Dirk Dougherty
9cab5c0116 Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager. 
Change-Id: I9cfa53e605f476daf6cf914f256df600e1d77f89
 2013-01-29 15:21:20 -08:00
Dirk Dougherty
3b4b067bae Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev 2013-01-29 23:09:41 +00:00
Dirk Dougherty
f04207aad5 Doc change: remove duplicate image directory (use /sdk/images instead). 
Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f
 2013-01-29 14:26:02 -08:00
Scott Main
4b7161cbd4 docs: switch devsite doc build to use templates-sdk 
Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930
 2013-01-29 14:20:13 -08:00
Scott Main
e75cd4bfd1 docs: add hdf bool for deviste, used to change aspects of the templates 
Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c
 2013-01-29 08:29:40 -08:00
Scott Main
48f9f83ba2 Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev 2013-01-29 00:49:59 +00:00
Dirk Dougherty
7b32d32bd3 Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev 2013-01-29 00:40:57 +00:00
Dirk Dougherty
289ad99c17 Add build rule for ds (devsite) online docs. 
Change-Id: I4f1d099995402613f58401a506ba272abfb563ba
 2013-01-28 15:43:49 -08:00
Dirk Dougherty
2c1669c427 Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev 2013-01-28 21:26:01 +00:00
Dirk Dougherty
10550e5bd8 Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed. 
Change-Id: Ib33511f75b72a8019fffb13d396b608cf8e270d2
 2013-01-28 13:17:51 -08:00
Adam Koch
376e707f65 Displaying Bitmaps Efficiently Training - Update sample app 
Update sample app zip (see http://ag/268000)

Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1
 2013-01-28 13:58:14 -05:00
Scott Main
7467a0f002 docs: update adb tool page with am and pm reference 
Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b
 2013-01-28 10:56:39 -08:00
Dirk Dougherty
df9fa4c602 Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava. 
Change-Id: I0bf0c691db8f190215f95ab8659e28fd73a496d7
 2013-01-25 12:55:16 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today! 
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
 2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Robert Ly
4efe071ed6 docs: update auth doc to mention multiple scopes bug 7644251 
Change-Id: I7f0c2e822c306161ae02b11439e5e0095463bcff
 2013-01-18 13:33:25 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00
Robert Ly
a239b933f7 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:23:29 -08:00
Robert Ly
548e17dfdb Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 2013-01-18 18:20:40 +00:00
Roman Nurik
fb80c9e0f8 docs: Add PageTransformer to animations training class 
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
 2013-01-17 15:37:20 -08:00
Andy McFadden
ee3a1d5ece am 9b6687bb: Fix code snippet 
* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet
 2013-01-17 12:09:40 -08:00
Andy McFadden
9b6687bbc6 Fix code snippet 
One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
 2013-01-17 11:24:02 -08:00
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Dirk Dougherty
4a0f95cffb am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:37:03 -08:00
Dirk Dougherty
3987f6c179 Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 2013-01-17 00:30:09 +00:00
Scott Kennedy
3332aa9852 am d7ec742c: docs: Minor typos 
* commit 'd7ec742c30be95da4d20930dd5000897bfe3f127':
  docs: Minor typos
 2013-01-16 10:08:08 -08:00
Dirk Dougherty
4166513f23 Doc change: Fix urls to work properly with https. 
Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd
 2013-01-15 19:57:25 -08:00
Scott Kennedy
d7ec742c30 docs: Minor typos 
One of these was mentioned in a comment in external 40435

Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
 2013-01-15 19:33:56 -08:00
Scott Main
ceddf9f8e8 am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
  docs: put new devbytes playlist on the develop landing
 2013-01-15 15:25:04 -08:00
Scott Main
3c3995f5ab Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 2013-01-15 15:20:53 -08:00
Scott Kennedy
39ea055f9e am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit '335da367a167d11eefb9d8127b9423093213bcc8':
  docs: Another fix for external 42607
 2013-01-15 14:29:20 -08:00
Scott Kennedy
335da367a1 Merge "docs: Another fix for external 42607" into jb-mr1-dev 2013-01-15 14:24:24 -08:00
Scott Main
5b61ad2a9e docs: put new devbytes playlist on the develop landing 
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
 2013-01-15 11:18:48 -08:00