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

94972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
00f490844d Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 2013-02-06 20:14:49 +00:00
The Android Open Source Project
90976c8493 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668
 2013-02-06 09:11:21 -08:00
Sungmin Choi
dfe4db1450 update APN version for MVNO 
As adding MVNO feature, update APN version from 7 to 8.
To recognize MVNO, use new elements, spn, imsi, gid, mvno_type.

Bug: 8143480

Change-Id: Ib8e7370ebc99c1518e6d9337621e64966c128a0b
 2013-02-06 12:09:20 +09:00
Adam Powell
0714e37cb7 am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse 
# Via Android Git Automerger (2) and Adam Powell (1)
* commit 'a7e028a976c3f3692fa3c72f0ae11c01354e4c9a':
  Fix re-enabled state of up after action view collapse
 2013-02-05 16:54:45 -08:00
Adam Powell
bd0fd29f83 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:53:26 -08:00
Adam Powell
a7e028a976 am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse 
# Via Adam Powell (1) and Android Git Automerger (1)
* commit 'cef582ab0346afdaff9190565d432a9468ecdd7d':
  Fix re-enabled state of up after action view collapse
 2013-02-05 16:53:04 -08: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
c92199be84 am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '33fb8f6309c553c809717694a84fe6564b19604f':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:26:29 -08:00
Robert Ly
33fb8f6309 am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'dfa8d02861ac2afb7addcb884b58dd009e2f212e':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:24:30 -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
Craig Mautner
e57ed27a14 am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate" 
# By Sangkyu Lee
# Via Android Git Automerger (1) and others
* commit '246a283c007e007181f8892df514dfe04121b7a5':
  Fix unexpected rotation change when re-enabling auto-rotate
 2013-02-05 14:26:28 -08:00
Craig Mautner
246a283c00 am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate" 
# By Sangkyu Lee
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'fd5a0b3681499cbee0d1156b3b6f93fc91320848':
  Fix unexpected rotation change when re-enabling auto-rotate
 2013-02-05 14:24:10 -08:00
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect 
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
 2013-02-05 14:23:13 -08:00
The Android Open Source Project
aee2de934d Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I7375c870961b812350a960b43344619cdd9ed8ea
 2013-02-05 13:50:17 -08:00
Craig Mautner
fd5a0b3681 Merge "Fix unexpected rotation change when re-enabling auto-rotate" 2013-02-05 21:31:12 +00:00
quddusc
a8ce402078 am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via Android Git Automerger (3) and quddusc (1)
* commit '77c6f8ee22c66c829ea91740d178ff3323e1cb67':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:36:11 -08:00
quddusc
77c6f8ee22 am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via Android Git Automerger (2) and quddusc (1)
* commit 'a6a320ab6699e17d22aea8fa21345e86cae0349c':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:33:52 -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
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
quddusc
1247fbd43f docs: Removed the -e runner subcommand option. 
Bug: 7562330

Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
 2013-02-05 11:37:46 -08:00
Robert Ly
9fcde2e746 am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cb8156996a3bf5f75ea3dd7c289970bae32079ce':
  docs: update javadocs for gms and gcm
 2013-02-05 10:23:04 -08:00
Robert Ly
cb8156996a am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '00e9db5d927e1c725665159f6b5c15e0c33a4c1b':
  docs: update javadocs for gms and gcm
 2013-02-05 10:21:41 -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
Kenny Root
2697f08201 am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error" 
# Via Android Git Automerger (1) and others
* commit '887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
  AndroidKeyStore: return error code on error
 2013-02-04 17:37:34 -08:00
Kenny Root
887c523646 am 74637db2: Merge "AndroidKeyStore: return error code on error" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '74637db21eb0b3c0167378e2b5c866fdc02e51f2':
  AndroidKeyStore: return error code on error
 2013-02-04 17:35:35 -08:00
Kenny Root
74637db21e Merge "AndroidKeyStore: return error code on error" 2013-02-05 00:20:47 +00:00
Scott Main
d3c150e5ef am e218ac96: am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e218ac96f4b3229879256926595b080cc5266172':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:58:51 -08:00
Scott Main
e218ac96f4 am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (2) and Scott Main (1)
* commit '1dba73f64c60d25776c937be146a7880b85a193a':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:51:44 -08:00
Kenny Root
e66769ad51 AndroidKeyStore: return error code on error 
Instead of blindly multiplying return value by 1000 to convert to
milliseconds, check to see if it's an error condition first.

Change-Id: I8eab1e7a86d78c13458fcbbc79d590e452fc9791
 2013-02-04 15:50:58 -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
9045b1d1e3 am a6404338: am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'a64043382309c60c86b48ad45e752f44a5a71ca1':
  docs: update dashboard platform data for feb
 2013-02-04 15:23:50 -08:00
Scott Main
a640433823 am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'd042b849df13e700f4b73dcec28220cafcc3a595':
  docs: update dashboard platform data for feb
 2013-02-04 15:22:06 -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
Kenny Root
864162026d am c4a768c8: am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test" 
# Via Android Git Automerger (1) and others
* commit 'c4a768c87e03a5e6d8b4435aaca6893546006321':
  AndroidKeyStore: add key wrapping test
 2013-02-04 15:12:04 -08:00
Kenny Root
f2f8460192 am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests" 
# Via Android Git Automerger (1) and others
* commit '516fab2404f550aca03b3774bd5b279d4e69dd9f':
  AndroidKeyStore: fix tests
 2013-02-04 15:12:01 -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
Kenny Root
c4a768c87e am 5a720bb9: Merge "AndroidKeyStore: add key wrapping test" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '5a720bb9b031d44e593d2054bda586ccc3752aa4':
  AndroidKeyStore: add key wrapping test
 2013-02-04 15:10:26 -08:00
Kenny Root
516fab2404 am 133c5f5e: Merge "AndroidKeyStore: fix tests" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '133c5f5e91e72cff1a9a3a4903a0efc96b39165b':
  AndroidKeyStore: fix tests
 2013-02-04 15:10:22 -08:00
Kenny Root
5a720bb9b0 Merge "AndroidKeyStore: add key wrapping test" 2013-02-04 23:05:08 +00:00
Kenny Root
133c5f5e91 Merge "AndroidKeyStore: fix tests" 2013-02-04 23:01:01 +00:00