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

104850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
3d205ab01e Doc change: update Google Play policies descriptions. 
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
 2013-08-23 10:11:44 -07:00
Scott Main
cd4e1c463e am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit 'f151391b72b5ab667ea0681de5bd2fbe0d94d8a9':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 18:54:35 -07:00
Scott Main
f151391b72 fix markup errors in action bar styling, 
add more information about using drawables,
move 'managing the activity lifecycle' down a notch, because it's less interesting.

Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
 2013-08-22 18:44:44 -07:00
Scott Main
f5e0970c47 replace instances of Wi-Fi Direct with Wi-Fi P2P 
Change-Id: I21cb06e27e98c428b4f3f4ac72e759f61607e468
 2013-08-22 17:41:10 -07:00
Dirk Dougherty
de525b442f am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs 
* commit '2a4f71df86e42f14705df452b74358e0b7970815':
  Temporarily disable sample code html generation in docs builds.
 2013-08-22 10:08:08 -07:00
Dirk Dougherty
2a4f71df86 Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs 2013-08-22 17:03:41 +00:00
Dirk Dougherty
a345833ace Temporarily disable sample code html generation in docs builds. 
Change-Id: Ibcf0e4d5ab63968211528f528cc5bee914d7a556
 2013-08-21 14:52:00 -07:00
Scott Main
1b3f1533ce am 414905b7: update samples nav for new script 
* commit '414905b7044b10b7231f13584bf26e7c8c3e1e12':
  update samples nav for new script
 2013-08-20 17:17:34 -07:00
Scott Main
414905b704 update samples nav for new script 
Change-Id: I4b357f1edf2d8e3eb7b3810103c60d3fd470e113
 2013-08-20 17:07:05 -07:00
Joe Fernandez
d1037efe7e am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 
* commit '9d237204da9b000c5debfa1f5650d13a545bb7c8':
  Android 4.3 Platform Google APIs r2 system image Release Notes
 2013-08-19 16:49:44 -07:00
Joe Fernandez
9d237204da Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 2013-08-19 23:47:24 +00:00
Joe Fernandez
312d29ed3d Android 4.3 Platform Google APIs r2 system image Release Notes 
Google APIs System image update with Google Play Services 3.2.25

Change-Id: Iac6987a9dcb55bd971da9ca57c5a5dae0c357be5
 2013-08-19 16:43:57 -07:00
Dirk Dougherty
364fe3a856 am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters. 
* commit 'b6bc020d728960dc876a510c9e40cc441a9a9b6b':
  doc change: Samples browsing first changes: Samples dir and file starters.
 2013-08-19 12:09:45 -07:00
Dirk Dougherty
b6bc020d72 doc change: Samples browsing first changes: Samples dir and file starters. 
Change-Id: I6cc8c03bf4c2bcc771d4531619db5b3acd62601f
 2013-08-19 11:19:38 -07:00
Wink Saville
dce52cdbf1 DO NOT MERGE: MDST is not ready until connected to DcTracker. 
When the system becomes loaded the PhoneApp can be delayed
significantly and a call to setEnableFailFastMobileData may not
occur because the channel between the MobileDataStateTracker (MDST)
and DcTracker (DCT) is not connected.

Solution: Add a isReady to MDST and isMobileDataStateTrackerReady to
ConnectivityService and call it from isMobileOk.

Bug: 10351868
Change-Id: I92f9d58121b88186b636cd71c2fd2ef9a28f7cf6
 2013-08-16 17:17:28 -07:00
Scott Main
8f5a76d2bf am b4f96287: add latest Roboto fonts to DAC and update download links 
* commit 'b4f96287285cd0886954d1576157b7a38995af88':
  add latest Roboto fonts to DAC and update download links
 2013-08-16 10:55:07 -07:00
Scott Main
b4f9628728 add latest Roboto fonts to DAC and update download links 
Change-Id: I6232cf02486d5b82d503ebe8c6035a7da2a1093d
 2013-08-16 10:41:31 -07:00
Wink Saville
e63411f28b In isMobileOk don't execute finally if mobile data is not supported. 
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.

Bug: 10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
 2013-08-15 21:14:30 -07:00
Roman Nurik
8ab80f1a02 am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:21:45 -07:00
Roman Nurik
1a5bb9d5cf Update Typography design guide 
Bug: 6947941

Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
 2013-08-14 10:48:26 -07:00
Kenny Root
965eb25843 am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '1c2cb6533bfebf8b930850215e24327420e34a4b':
  Use hostname verifier directly instead of instance
 2013-08-13 17:57:10 -07:00
Kenny Root
1c2cb6533b am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '999ddae70360fc99e804d0b176af487582cd37c8':
  Use hostname verifier directly instead of instance
 2013-08-13 17:54:18 -07:00
Kenny Root
999ddae703 am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'ae24c0d539414805a6c979f9318d0765506221ae':
  Use hostname verifier directly instead of instance
 2013-08-13 17:51:15 -07:00
Kenny Root
ae24c0d539 am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'bf15c7cecefba8fdb3070c389a4966f11a8d8656':
  Use hostname verifier directly instead of instance
 2013-08-13 17:48:20 -07:00
Kenny Root
bf15c7cece am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
  Use hostname verifier directly instead of instance
 2013-08-13 17:44:27 -07:00
Kenny Root
dceda36b00 am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
  Use hostname verifier directly instead of instance
 2013-08-13 17:42:45 -07:00
Kenny Root
1c5e33d37d am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
  Use hostname verifier directly instead of instance
 2013-08-13 17:36:42 -07:00
Kenny Root
3bc3240ffb am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
  Use hostname verifier directly instead of instance
 2013-08-13 17:31:32 -07:00
Kenny Root
a6226a2d20 am 32c99004: Use hostname verifier directly instead of instance 
* commit '32c990044f027542a034a7606cf010dca6df252f':
  Use hostname verifier directly instead of instance
 2013-08-13 17:27:49 -07:00
Kenny Root
32c990044f Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
 2013-08-13 14:13:08 -07:00
Kenny Root
61768c97d6 am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE 
* commit '3870c570bbd438cefd09a061b9481314a15dd659':
  Use hostname verifier directly instead of instance DO NOT MERGE
 2013-08-13 11:41:11 -07:00
Kenny Root
3870c570bb Use hostname verifier directly instead of instance DO NOT MERGE 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
 2013-08-13 11:00:10 -07:00
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 10:57:31 -07:00
Katie McCormick
e50078961a am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb 
* commit 'e78b4f53392d25eda4a121670aca518df9615f71':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-12 12:18:45 -07:00
Katie McCormick
e78b4f5339 Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-12 12:07:26 -07:00
Scott Main
6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." 
Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
 2013-08-12 17:40:37 +00:00
Scott Main
ebcee19783 Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" 
revert to fix conflicts, i'll fix it all later.

This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.

Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
 2013-08-12 17:08:28 +00:00
Scott Main
b478b10f34 Revert "Doc change: collapse key fix." 
To resolve conflict. I'll fix it all later.

This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
 2013-08-12 09:57:24 -07:00
Katie McCormick
385bb2eb51 resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev 
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
 2013-08-09 17:55:05 -07:00
Katie McCormick
45178b1340 Merge "Doc change: collapse key fix." into jb-mr2-dev 2013-08-09 22:41:35 +00:00
Katie McCormick
53d9628d08 Doc change: collapse key fix. 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-09 15:32:23 -07:00
Wink Saville
02eab434ad am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 
* commit '4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
  If in a mobile captive portal is detected enable fail fast.
 2013-08-08 15:43:24 -07:00
Wink Saville
55adb390bb am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 
* commit '35152f13b3302dbcb43345458dd5b8b092e37320':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
 2013-08-08 15:43:13 -07:00
Wink Saville
b9b4321b75 am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev 
* commit '5191b8599011c255936e3a3cacc052c03e57b772':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
 2013-08-08 15:43:07 -07:00
Wink Saville
9b6363e5e6 am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev 
* commit 'cbad1243ad901b8ffcb7497a8f440414b8d41898':
  Check that hipri has started.
 2013-08-08 15:43:00 -07:00
Wink Saville
4d87d91dfe Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3 Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 2013-08-08 22:06:21 +00:00
Wink Saville
5191b85990 Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev 2013-08-08 22:05:20 +00:00
Wink Saville
cbad1243ad Merge "Check that hipri has started." into jb-mr2-dev 2013-08-08 22:03:45 +00:00
Joe Malin
93bb7bf22d am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 
* commit '5986f49751e563adf443baca589419e1eb9fbf84':
  Doc Change: Fix 10224981 error in code snippet
 2013-08-08 10:17:31 -07:00