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

88916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
afd51f18e5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-05 12:24:23 -08:00
Robert Ly
b23a35a3b9 am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'ba84a04a2f98683f08cc7c73ec60341dc77d1eb9':
  docs: update javadocs for gms and gcm
 2013-02-05 10:15:57 -08:00
Robert Ly
ba84a04a2f Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 2013-02-05 18:12:56 +00:00
Robert Ly
f6f5cf484c docs: update javadocs for gms and gcm 
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
 2013-02-05 09:26:35 -08:00
Scott Main
83359e824d am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Scott Main
* commit '5439e0c2f7978a06c549f19531aee1ab2003fa35':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:47:59 -08:00
Scott Main
5439e0c2f7 docs: followup update for dashboard; add platform pie 
Change-Id: I70b8d4e0384d995761a66afc34a66bcb03e5e74e
 2013-02-04 15:42:13 -08:00
Scott Main
641f74aefe am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dde4eedfb1b488fb02b2a54fb1c64f0a9ca70cfb':
  docs: update dashboard platform data for feb
 2013-02-04 15:18:36 -08:00
Scott Main
dde4eedfb1 Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 2013-02-04 23:10:46 +00:00
Scott Main
d799ffc235 docs: update dashboard platform data for feb 
Change-Id: Ie248bf69bcdca4434e53ab31a82a55fd9da4825b
 2013-02-04 14:02:48 -08:00
Adam Powell
67389e0ace Merge "Fix regression in expanded action view up" into jb-mr1.1-dev 2013-02-04 21:43:18 +00:00
Dirk Dougherty
98ffd11c25 am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds. 
# Via Dirk Dougherty
* commit '2623157244ae397fcaeecc46fab83a307b49b48f':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
 2013-02-04 13:42:42 -08:00
Dirk Dougherty
2623157244 Doc change: add redirects file (yaml) for use in devsite docs builds. 
Change-Id: I87d922bd4959c093544caf2addcb322ca7208fe8
 2013-02-04 13:39:38 -08:00
Adam Powell
62f33030b9 Fix regression in expanded action view up 
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.

Bug 8124825

Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
 2013-02-04 12:47:34 -08:00
The Android Automerger
2a8b9262fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-01 18:25:20 -08:00
Dirk Dougherty
3d57823a2e am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
# Via Dirk Dougherty
* commit '8a72b6e0db11dec73253b938defc2847a8c8234d':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
 2013-02-01 15:52:33 -08:00
Dirk Dougherty
8a72b6e0db Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
Change-Id: I1c2276f5fb057a0ca20c0d1feef2bce0ab7ffab8
 2013-02-01 15:00:09 -08:00
Scott Main
8b62c402cd am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'bf1d230b05becec58992fb10967b9b6dba67b967':
  docs: delete orphaned images (the obvious ones)
 2013-02-01 14:27:13 -08:00
Scott Main
bf1d230b05 Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 2013-02-01 22:23:01 +00:00
Scott Main
3424794d55 am e63dfe5a: docs: fix broken links 
# Via Scott Main
* commit 'e63dfe5a4804b24e3acb537763d821036b5bb87f':
  docs: fix broken links
 2013-02-01 14:22:40 -08:00
Dirk Dougherty
120f7eb5e2 am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit 'e929e66197bf1421c3afbada964b1a33816ccaa8':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
 2013-02-01 14:22:35 -08:00
Scott Main
e63dfe5a48 docs: fix broken links 
Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17
 2013-02-01 14:18:51 -08:00
Dirk Dougherty
e929e66197 Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 2013-02-01 22:03:41 +00:00
Dirk Dougherty
b4c6c1b218 Doc change: Remove proto scheme from src urls (fix mixed content warning). 
Change-Id: I405d0f2e3df5e6e22bf9b09be27f7f7a2d93ba5a
 2013-02-01 13:35:42 -08:00
Scott Main
d2242891df am e55d5e86: docs: change "android developer console" to "developer console" 
# Via Scott Main
* commit 'e55d5e864b133df8ccf9f92ca4a5d3accb1dab5c':
  docs: change "android developer console" to "developer console"
 2013-02-01 13:28:19 -08:00
Scott Main
6c9d637339 am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'f216ded93a783cd4e512f59ba50d04a89d59a267':
  docs: clarify usage for adb am component option
 2013-02-01 13:28:15 -08:00
Fabrice Di Meglio
9fd4893c56 am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '7bac3614ff0ee3cef83147cb569c96c00beab919':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
 2013-02-01 13:28:12 -08:00
Dirk Dougherty
65fd9811d3 am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '2aa47b336227a5d2bd1ee91f8fb4bd84be7e97f0':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
 2013-02-01 13:28:08 -08:00
Dirk Dougherty
01084b96a1 am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '3b4b067baec59207640d534be86c7c6c12b06678':
  Doc change: remove duplicate image directory (use /sdk/images instead).
 2013-02-01 13:28:05 -08:00
Scott Main
1e7e1104c4 am 4b7161cb: docs: switch devsite doc build to use templates-sdk 
# Via Scott Main
* commit '4b7161cbd44f64537d2c661e87868ea2689dd126':
  docs: switch devsite doc build to use templates-sdk
 2013-02-01 13:28:01 -08:00
Scott Main
5c37151cb0 am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates 
# Via Scott Main
* commit 'e75cd4bfd176fbb1483ec5e17edfbd993adce40f':
  docs: add hdf bool for deviste, used to change aspects of the templates
 2013-02-01 13:27:57 -08:00
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
The Android Automerger
7fddb002fb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-30 20:05:52 -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