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

104830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
c6d085a517 am 37453a83: Merge "Docs: Changed" into jb-mr2-docs 
* commit '37453a8353a190233c94c9f40261feef6a9ebf08':
  Docs: Changed
 2013-09-27 10:30:09 -07:00
David Friedman
165489da28 am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs 
* commit '2fe85a10abcb216dded99792466124f7f80574f2':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
 2013-09-27 10:30:06 -07:00
David Friedman
707bac2bdc am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs 
* commit '0b1cfc1fb64a1b24f107abf106eb839287f65cfb':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360
 2013-09-27 10:30:03 -07:00
David Friedman
1b8e319784 am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs 
* commit '8c38ea39203016dde95bc5dd68f27f6f45096784':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
 2013-09-27 10:30:01 -07:00
David Friedman
b648f9509b am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099 
* commit '23bd5927f1c82f3f63288fbee4e7c460fca3dc4e':
  Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
 2013-09-27 10:26:23 -07:00
David Friedman
37453a8353 Merge "Docs: Changed" into jb-mr2-docs 2013-09-27 17:25:42 +00:00
David Friedman
2fe85a10ab Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs 2013-09-27 17:25:29 +00:00
David Friedman
0b1cfc1fb6 Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs 2013-09-27 17:25:16 +00:00
David Friedman
8c38ea3920 Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs 2013-09-27 17:24:41 +00:00
David Friedman
36b692d8ef Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. 
Bug: 10807931 10796994

Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
 2013-09-27 10:04:48 -07:00
David Friedman
23bd5927f1 Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. 
Bug: 10796099

Change-Id: Ideb1dbf70b9034e88683ef19ec1a3d338b7ea06b
 2013-09-26 22:30:11 -07:00
David Friedman
8ca6a095a3 Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. 
Bug: 10797360

Change-Id: I95344c2200cad5efb6457a9cb8fcd0e87298dcda
 2013-09-26 17:19:43 -07:00
Scott Main
194925f9e8 am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page. 
* commit 'a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
 2013-09-26 16:20:41 -07:00
Scott Main
a8f519ff9c add Wallet Instant Buy and Google Cloud Platform to the Google services landing page. 
Change-Id: I196ac5955477cd822bbf78a9cd4fd53a3d8fbd5f
 2013-09-26 16:17:57 -07:00
David Friedman
2e7c8e952c Docs: Changed 
// Send the negative button event back to the host activity
mListener.onDialogPositiveClick(NoticeDialogFragment.this);

to

// Send the negative button event back to the host activity
mListener.onDialogNegativeClick(NoticeDialogFragment.this);

Bug: 10641712
Change-Id: Ib6af3318928c56cf9d12adbffbd7edff23f116db
 2013-09-26 14:28:51 -07:00
Scott Main
ce57e1a6f3 am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:45:22 -07:00
Scott Main
4c9ed63cc6 update the nav drawer lesson to link to new action bar icon pack, 
which now includes the nav drawer icon

Change-Id: I0d6452fa5b4856b96268763141d74dd8f83c221d
 2013-09-26 12:39:27 -07:00
Scott Main
a37c524ffc am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit '54f8facfc8d103e6dd7211bbabfe36d083798731':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:37:44 -07:00
Scott Main
54f8facfc8 update action bar icon pack with xxhdpi assets 
bug: 9761668

Change-Id: Ib76dec4f90052c803c224f6489876644ee2f44ab
 2013-09-26 12:30:30 -07:00
Adam Koch
cf5a962b05 am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit 'e405da02208145d2ea8de0759c0f0027d4560840':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:06:17 -07:00
Adam Koch
e405da0220 Doc fix: remove insecure sharing suggestions from training class 
Bug: 10841151

Change-Id: I11de149d512340d098a8c23661cd6f6a342718d5
 2013-09-26 17:54:46 +00:00
Scott Main
ad95c41518 am 857814c6: add mention of google cloud to Android Studio landing page 
* commit '857814c688e6c867cf1e433091931bc84d15d1cb':
  add mention of google cloud to Android Studio landing page
 2013-09-25 16:48:58 -07:00
Scott Main
857814c688 add mention of google cloud to Android Studio landing page 
Change-Id: Ia363f5384f509722aee0ef83964069767b4911f8
 2013-09-25 16:20:05 -07:00
David Friedman
e440cde0c4 Docs: "radio button"->"checkbox" in "Tip" at bottom of doc 
Bug: 10641902

Change-Id: Iff5190dd5c6ce50530233f9ac7e8aed4c9b83327
 2013-09-25 10:43:17 -07:00
Katie McCormick
7736463172 am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs 
* commit 'a9fcf6620d418268ab3e9ee8b13b37e85825e6f8':
  New Scheduling class.
 2013-09-23 13:43:42 -07:00
Katie McCormick
a9fcf6620d Merge "New Scheduling class." into jb-mr2-docs 2013-09-23 20:40:46 +00:00
Katie McCormick
7bdb3f6997 New Scheduling class. 
Change-Id: Iadd9d0d1d3bb8fa6a145d68ee28ae9912a6a9f4c
 2013-09-23 10:02:20 -07:00
Wink Saville
ab8cabf1d3 am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false) 
* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)
 2013-09-21 11:30:33 -07:00
Wink Saville
1e4f461839 Do not always call setIsConnectedToProvisioningNetwork(false) 
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
 2013-09-21 09:01:19 -07:00
David Friedman
217683d95d am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 
* commit 'e12437284fcf94aed4ac5c2e10401b70fb1be086':
  Fixed typo: Added missing word. Bug 10617080 Fixed typo:
 2013-09-20 19:05:55 -07:00
David Friedman
e12437284f Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 2013-09-21 02:02:45 +00:00
David Friedman
5f1755961b Fixed typo: Added missing word. 
Bug 10617080
Fixed typo:

"Determine if AccountManager for You"
-->
"Determine if AccountManager is for You"

Change-Id: I5b8f1368dad72bbbeb581132f480baf46a029be8
 2013-09-20 18:33:30 -07:00
Dirk Dougherty
8ea8ff81a9 am 78ec732f: Doc change: Update Google Play Services reference docs. 
* commit '78ec732f73aedc6afd79c4f924345a5adb61dc54':
  Doc change: Update Google Play Services reference docs.
 2013-09-20 11:46:23 -07:00
Dirk Dougherty
78ec732f73 Doc change: Update Google Play Services reference docs. 
Change-Id: Iaed2e01a18263000509f243e66a6b6b33037d6b9
 2013-09-20 11:30:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:04:26 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00
Scott Main
9bcea321af add custom head tag to verify developers@android.com as site owner 
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
 2013-09-20 09:10:08 -07:00
Joe Fernandez
6e3b21cc83 am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '72f65780c77f9c0c306fcb53efeb62fbeba3899c':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:44:58 -07:00
Joe Fernandez
72f65780c7 Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 2013-09-19 23:41:39 +00:00
Joe Fernandez
0d8f0849ff am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '1d65500d6e16e497774dbff3b5d94cfd5256d118':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-19 16:38:06 -07:00
Joe Fernandez
cedec4560e docs: Fix for SDK 22.2.1 Windows download checksum and size 
external bug: http://b.android.com/60257

Change-Id: I399d21fd792c7c9a1bfac4402bc76fa23d45415b
 2013-09-19 16:32:28 -07:00
Joe Fernandez
1d65500d6e docs: Google APIs emulator 18 r3 - Platform Release Notes 
Change-Id: I5c11c8c480aa5dcd515f11ae5a4c40b28197a572
 2013-09-19 13:55:43 -07:00
Joe Fernandez
1c774af0d3 am 608a48af: Merge "docs: SDK 22.2.1 Release Notes" into jb-mr2-docs 
* commit '608a48afe4a852ec543f5fe15ea67807e326a8b2':
  docs: SDK 22.2.1 Release Notes
 2013-09-18 21:28:33 -07:00
Joe Fernandez
fe2d0c4cbe am 3ce21086: Merge "docs: RenderScript Dev Guide fixes" into jb-mr2-docs 
* commit '3ce210869725619c3222dc8147d1117d9a8c47c9':
  docs: RenderScript Dev Guide fixes
 2013-09-18 21:28:30 -07:00
Joe Fernandez
608a48afe4 Merge "docs: SDK 22.2.1 Release Notes" into jb-mr2-docs 2013-09-19 04:27:16 +00:00
Joe Fernandez
3ce2108697 Merge "docs: RenderScript Dev Guide fixes" into jb-mr2-docs 2013-09-19 04:26:38 +00:00
James Kelly
2815bb05a0 am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit '48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:04:45 -07:00
James Kelly
48c6b5735e Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 2013-09-19 01:02:13 +00:00
Joe Fernandez
38f8b7371a docs: RenderScript Dev Guide fixes 
Change-Id: I0d0ef44df989419e9335789e2957fbd94c49615f
 2013-09-18 16:08:25 -07:00
Joe Fernandez
2ef08f6c9f docs: SDK 22.2.1 Release Notes 
Change-Id: I5c07cdb518388bec40388b295eec1f9227f80da4
 2013-09-18 15:35:28 -07:00