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

88971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
9b8b4ae5d7 am f2d89ef9: 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 others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:16:11 -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
11fa446033 am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
  makefile changes for gcm javadocs
 2013-02-07 17:55:20 -08: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
ee27bcda86 am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b68702eb0526633e51d9dbfe6fc971c168e1274a':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:21:29 -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
80a01a7f1d am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit 'ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
  Doc update: clean up
 2013-02-07 15:52:32 -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
0a00de118e am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '805d2e2d98fa8749d6ae38650c77c79611174944':
  docs: fix renderscript links that currently require redirect
 2013-02-06 12:20:59 -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
cef582ab03 am 07cf971e: Fix re-enabled state of up after action view collapse 
# Via Adam Powell
* commit '07cf971e58aecab76f2b5b575cfe62120005c6e4':
  Fix re-enabled state of up after action view collapse
 2013-02-05 16:51:01 -08: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
dfa8d02861 am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '5e9be5bcf2d423e516d3c061fffc989ffa444212':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:22:52 -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
a6a320ab66 am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via Android Git Automerger (1) and quddusc (1)
* commit '640d570d255988ed9942cda6df5f162328668437':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:31:45 -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
00e9db5d92 am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b23a35a3b9f44f3f673e9cacc3684d034414df27':
  docs: update javadocs for gms and gcm
 2013-02-05 10:20:42 -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
1dba73f64c am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (1) and Scott Main (1)
* commit '83359e824d35a4c8a91c73efadb6d1a537c521cc':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:49:40 -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
d042b849df am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '641f74aefea7bd055307c22443839918438f6477':
  docs: update dashboard platform data for feb
 2013-02-04 15:19:53 -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
569f138ef1 am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '67389e0acec6877528c4cdaed99bf0a295bf74b9':
  Fix regression in expanded action view up
 2013-02-04 13:48:49 -08:00
Dirk Dougherty
db3ace2126 am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '98ffd11c25cb620872a0dd4421332c41309ac475':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
 2013-02-04 13:45:05 -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
ed1c148dc3 am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '3d57823a2e813ef9d535aab6c40ecbc509f5ab71':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
 2013-02-01 15:54:54 -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
b89123ddd4 am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '8b62c402cdb50b8b1b1ff5d1f17021f89866b4c6':
  docs: delete orphaned images (the obvious ones)
 2013-02-01 14:29:47 -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
e63e6d0711 am 3424794d: am e63dfe5a: docs: fix broken links 
# Via Android Git Automerger (1) and Scott Main (1)
* commit '3424794d55ff5c97c89d930d9ad2a577cb2b2f52':
  docs: fix broken links
 2013-02-01 14:26:05 -08:00