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

88368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
dacaad4ab2 Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 2013-04-24 19:08:42 +00:00
Dirk Dougherty
71f8127165 Doc change: Add tablet optimization tips info/link. 
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
 2013-04-24 11:49:27 -07:00
Selim Gurun
006119bf2c Merge commit '8237dd82' into manualmerge 
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
 2013-04-23 11:19:12 -07:00
Dirk Dougherty
00cfba95ce Doc change: update support urls. 
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
 2013-04-22 16:37:01 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account. 
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
 2013-04-22 14:17:36 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist. 
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
 2013-04-20 11:34:51 -07:00
Selim Gurun
758dfa0c33 am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:19:45 -07:00
Selim Gurun
3c4fa65480 am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:19:41 -07:00
Geremy Condra
b7787a317f DO NOT MERGE Merge commit '8225df00' into bp 
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
 2013-04-18 11:40:09 -07:00
Dirk Dougherty
c6af49efc4 Doc change: Add tablet basic checks. 
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
 2013-04-15 20:55:25 -07:00
Dirk Dougherty
99a79e807b Doc change: add policy guidelines documents. 
Change-Id: Iade088d20bc483fb65aabd85cb049b21188edf64
 2013-04-12 14:55:11 -07:00
Selim Gurun
8237dd82bf am 93c39d5d: DO NOT MERGE Fix issues during backport 
* commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af':
  DO NOT MERGE Fix issues during backport
 2013-04-05 12:05:52 -07:00
Selim Gurun
93c39d5d4f DO NOT MERGE Fix issues during backport 
Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
 2013-04-04 16:31:01 -07:00
Selim Gurun
9d47e7b6d4 am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-04 11:08:35 -07:00
Selim Gurun
679c8f689f am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '38915fd4d466cc233189bf5b5c11d7f03a416d35':
  Revert "Add a delimiter between scheme and host"
 2013-04-04 11:00:46 -07:00
Selim Gurun
7918cf4e6b DO NOT MERGE Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f
 2013-04-04 11:00:25 -07:00
Selim Gurun
38915fd4d4 Revert "Add a delimiter between scheme and host" 
This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
 2013-04-04 17:14:29 +00:00
Selim Gurun
8225df007e am aa2163dd: Add a delimiter between scheme and host 
* commit 'aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
  Add a delimiter between scheme and host
 2013-04-03 21:05:40 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
Selim Gurun
aa2163dd2a Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
 2013-04-01 16:04:23 -07:00
Joe Malin
98827948f1 Merge "Android Training: Accessing Contacts" into jb-mr1-dev 2013-03-26 16:31:22 +00:00
Christopher Tate
9432f83cea am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
  Validate restored file paths against their nominal domain
 2013-03-25 14:08:37 -07:00
Christopher Tate
7b3ac9add8 am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
  Validate restored file paths against their nominal domain
 2013-03-25 14:05:47 -07:00
Christopher Tate
0cb27e2807 Validate restored file paths against their nominal domain 
Bug 8460775

(cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
 2013-03-25 13:44:34 -07:00
Joe Malin
421435d2be Android Training: Accessing Contacts 
Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6
 2013-03-25 10:10:35 -07:00
Trevor Johns
58a54cb380 [docs] Fix issue #8288695: Typo in OAuth2 training 
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
 2013-03-06 14:46:47 -08:00
Scott Main
23513a2c85 docs: update country filtering description 
bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78
 2013-03-05 12:19:10 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86 cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f 
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
 2013-03-05 11:35:49 -08:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
 2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes. 
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
 2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes. 
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
 2013-03-01 16:17:09 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article 
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
 2013-03-01 09:49:41 -08:00
Joe Malin
5d64aa2ac3 Bug 8289268: Reversed text Content Provider Basics 
Change-Id: I4eab50651d47bb86709740595d982d9524a561fb
 2013-02-28 09:18:24 -08:00
Dirk Dougherty
1c7b442aae Merge "Doc change: update 'multiple apks' criteria in filters doc." into jb-mr1-dev 2013-02-28 02:51:16 +00:00
Dirk Dougherty
c511675bcb Doc change: update 'multiple apks' criteria in filters doc. 
Change-Id: I8504f5e019758946d567d4391c1a875dead236c5
Bug: 8277558
 2013-02-28 02:50:11 +00:00
Scott Main
d346b311ca Merge "docs: add MTK usb driver info" into jb-mr1-dev 2013-02-28 01:22:58 +00:00
Dirk Dougherty
d9019dd275 Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
Change-Id: I9bba5b8ffb7da40083904f6f471e99fd4c98d63d
Bug: 8033688
Bug: 8277558
 2013-02-27 14:34:24 -08:00
Scott Main
9d167eaa7d docs: another string change for developer console 
bug: 8033647

Change-Id: Ia6b476e22f2e370eeefd0556e2c9d0b4295482a9
 2013-02-27 10:08:27 -08:00
Scott Main
2d0b481f10 docs: followup to I32f25b692872ed7827e611890c563498993b2480 
Change-Id: I7942e243e77cbe9ea9a7cd542b4255f9ca273a4d
 2013-02-26 14:27:20 -08:00
Jean-Baptiste Queru
ed9cc555ee Reconcile with jb-mr1-release - do not merge 2013-02-26 14:03:20 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +00:00
Scott Main
1649f818e2 docs: add MTK usb driver info 
Change-Id: I847877e65207d065883e7ab74be65b6333ca205d
 2013-02-26 09:45:13 -08:00
Robert Ly
af7b843e97 docs: remove games references 
Change-Id: I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 07:49:56 -08:00
Robert Ly
7cbf2bc681 Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 2013-02-26 05:59:50 +00:00
Robert Ly
32c0cacf14 docs: gms cheddar updates for g+ 
Change-Id: I7ffd94fa17f0911f83e0c40462861a9e6080a197
 2013-02-25 20:44:05 -08:00
Robert Ly
05c8e63c76 docs: gms and gcm javadocs 
Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f
 2013-02-25 15:31:22 -08:00