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

106912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
458430d823 am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit '5ab9af410e1ba572e8ac0577c2acb5324b65d66c':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 17:03:59 -07:00
Robert Greenwalt
0e591c286e am 8098bfac: am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo 
* commit '8098bfac6a08d59697e308a524f96f69e482ecf7':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 17:03:56 -07:00
Robert Greenwalt
5ab9af410e am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit 'f76b5383cd568dcfafb6819449b846ff76072c44':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-04 14:17:18 -07:00
Robert Greenwalt
8098bfac6a am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo 
* commit 'dd8e315b86614627eb8ba629c713d73034fed357':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-04 14:15:52 -07:00
Robert Greenwalt
dd8e315b86 DO NOT MERGE Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
 2013-10-04 18:43:29 +00:00
Robert Greenwalt
f76b5383cd DO NOT MERGE Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
 2013-10-04 08:19:37 -07:00
Scott Main
ff7575985a am 542ddc4c: am f5468f6d: update dashboard stats for 10/2/13 
* commit '542ddc4c3b415cc1502e69c15c48595f9c7e402d':
  update dashboard stats for 10/2/13
 2013-10-02 16:36:07 -07:00
Scott Main
542ddc4c3b am f5468f6d: update dashboard stats for 10/2/13 
* commit 'f5468f6d42ad7bbc2f0ce8cb557330905914c3ec':
  update dashboard stats for 10/2/13
 2013-10-02 16:33:37 -07:00
Scott Main
f5468f6d42 update dashboard stats for 10/2/13 
Change-Id: I7d87142c6ed6b582582435933f5dbb2fcd0f2cac
 2013-10-02 16:29:29 -07:00
Scott Main
584d4f69e2 am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc. 
* commit '571774922ce5ace09c746fdb83cbdce243dad3e4':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
 2013-09-27 15:36:28 -07:00
Scott Main
571774922c am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc. 
* commit '4a9999f1ad20830df4aa38d3d3a42d73cb9986f0':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
 2013-09-27 15:33:18 -07:00
Scott Main
4a9999f1ad remove Remembering Your Users class from nav. 
Separate CL will redirect these pages to the Google Auth doc.

Change-Id: Ib47b8e0fffbe776626b463c1199f435a82e64170
 2013-09-27 15:24:35 -07:00
Amith Yamasani
01c2e173d9 am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '490399292d2160cf94231df7a9e07e8aa8237489':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:55:34 -07:00
Amith Yamasani
490399292d am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '49eb1d958198b2a88455c340c9d072469d065785':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:51:09 -07:00
Amith Yamasani
49eb1d9581 am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit 'd084cc44eb59407c851399d548256c145eb45342':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:46:29 -07:00
Amith Yamasani
d084cc44eb am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '4f59a9216e76207a7003bfe010076aa78eee629a':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:31:18 -07:00
Amith Yamasani
4f59a9216e am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '12fd0f1644b28b6938a504492397e8ca8d38a1c5':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:25:20 -07:00
Amith Yamasani
12fd0f1644 am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit 'f6a0c11615bd5c2c934527a0b20ba13f958913c4':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:23:08 -07:00
Amith Yamasani
f6a0c11615 am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '9bf1a1394852ad773d590d1cc60c5e50be8cb1b9':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:20:20 -07:00
Amith Yamasani
9bf1a13948 am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:17:57 -07:00
Amith Yamasani
72c5e37687 am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:14:23 -07:00
Amith Yamasani
ba1ae3af76 am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '427864188dfc5dd803b15797379b9dc6673abd16':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:10:36 -07:00
David Friedman
afd85f820e am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs 
* commit 'c6d085a5179311ba3d7395360e6e427fa4fb076c':
  Docs: Changed
 2013-09-27 10:37:27 -07:00
David Friedman
f0a5a844a9 am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs 
* commit '165489da28ff5b77d84095461934e86da8591f85':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
 2013-09-27 10:37:22 -07:00
David Friedman
ff379fc45c am 707bac2b: 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 '707bac2bdc40e3d98957e134331279534adf8e70':
  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:37:12 -07:00
David Friedman
233a341b6d am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs 
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
 2013-09-27 10:37:07 -07:00
David Friedman
657343d782 am b648f950: 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 'b648f9509b17bad806c907ffa5270901a86e6c06':
  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:33:15 -07:00
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
Amith Yamasani
427864188d Don't instantiate non-Fragments in Fragment.instantiate 
Backport...

Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
 2013-09-27 10:28:09 -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
ef4e5e6182 am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page. 
* commit '194925f9e894d35991920edbaa0681c1aea48120':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
 2013-09-26 16:23:06 -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
6d49f6980b am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit 'ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:48:04 -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
95fdf3d91f am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit 'a37c524ffc4a0387fac79e8ad4ab6319eeb99fa8':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:40:29 -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