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

89017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
f70b8c1ceb Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 2013-02-12 23:44:57 +00:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Xavier Ducrohet
47a021f764 Fix DateFormat for layoutlib. 
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
 2013-02-12 14:05:32 -08:00
Robert Ly
2328a77980 am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit '9eb66b2db4724da7a2d6575fee29840004f1a5df':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:49:44 -08:00
Robert Ly
9eb66b2db4 Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 2013-02-12 21:46:07 +00:00
Robert Ly
d3b50de375 Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 21:39:28 +00:00
Robert Ly
a95a64ddd6 am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit 'dc8ee2066a45adc6a57157c550e65317c8650ca0':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:41:20 -08:00
Robert Ly
dc8ee2066a Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 2013-02-12 18:37:51 +00:00
Robert Ly
343a89c2cd Revert "makefile changes for s.a.c" 
This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
 2013-02-12 18:29:10 +00:00
Scott Main
7209135504 am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Scott Main
* commit 'bfec2a01896959ba2bc9a995238eb31644ea8dc6':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:52:51 -08:00
Scott Main
bfec2a0189 docs: nudge dashboard chart to the right to avoid overlap 
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
 2013-02-11 14:24:03 -08:00
Robert Ly
96b1b403b6 am 4c01047e: makefile changes for s.a.c 
# Via Robert Ly
* commit '4c01047ec7b06aabeeae273c7871caa6c3029b84':
  makefile changes for s.a.c
 2013-02-11 14:10:00 -08:00
Robert Ly
4c01047ec7 makefile changes for s.a.c 
Change-Id: I501cc140994b2822c3df1f00639076f17765f256
 2013-02-11 13:38:31 -08:00
Dirk Dougherty
337d3e3240 am 7d849491: Doc change: fix typos. 
# Via Dirk Dougherty
* commit '7d8494913292dcdbe25d046cbef6e349d904b41c':
  Doc change: fix typos.
 2013-02-11 11:23:28 -08:00
Dirk Dougherty
7d84949132 Doc change: fix typos. 
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
 2013-02-11 11:18:59 -08:00
Joe Fernandez
46e31ae425 docs: Android SDK 21.1.0 Release Notes 
Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b
 2013-02-08 14:28:02 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Robert Ly
9da9a7cda2 am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'e60b6023ae4fdea932d0effc553dddc38117d235':
  makefile changes for gcm javadocs
 2013-02-07 17:53:29 -08:00
Robert Ly
e60b6023ae Merge "makefile changes for gcm javadocs" into jb-mr1-dev 2013-02-08 01:48:56 +00:00
Dirk Dougherty
34c880415b Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning. 
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
 2013-02-07 17:32:35 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:18:48 -08:00
Katie McCormick
0e66f16abd Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 2013-02-08 01:14:47 +00:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653 
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
 2013-02-07 16:42:26 -08:00
Katie McCormick
ef4196d0ec am 89fafaea: Doc update: clean up 
# Via Katie McCormick
* commit '89fafaeae73cc265f13775944ccb2841bbc6766c':
  Doc update: clean up
 2013-02-07 15:49:36 -08:00
Katie McCormick
89fafaeae7 Doc update: clean up 
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
 2013-02-07 14:23:14 -08:00
Robert Ly
5f9922d7c3 makefile changes for gcm javadocs 
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
 2013-02-07 11:08:44 -08:00
Scott Main
805d2e2d98 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect
 2013-02-06 12:19:30 -08:00
Scott Main
00f490844d Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 2013-02-06 20:14:49 +00:00
Adam Powell
07cf971e58 Fix re-enabled state of up after action view collapse 
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)

If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.

Bug 8142097

Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
 2013-02-05 16:24:25 -08:00
Robert Ly
5e9be5bcf2 am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'd6e0c147175708bcc02813fc0f4008179e95b9e7':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:19:45 -08:00
Robert Ly
d6e0c14717 Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 2013-02-05 23:17:36 +00:00
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect 
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
 2013-02-05 14:23:13 -08:00
quddusc
640d570d25 am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via quddusc
* commit '1247fbd43fc9d5492cb97d6313e851a6518ab4b8':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:29:08 -08:00
quddusc
1247fbd43f docs: Removed the -e runner subcommand option. 
Bug: 7562330

Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
 2013-02-05 11:37:46 -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
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