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

115510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
752d802917 Merge "Doc update: minor changes to immersive lesson" into klp-docs 2013-11-26 19:06:07 +00:00
Deepanshu Gupta
24541255c3 Update delegate methods in layoutlib. 
Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
 2013-11-25 19:59:54 -08:00
John Spurlock
e18b673a4d am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs 
* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
  Fix @see link in DocumentsContract docs.
 2013-11-25 23:29:29 +00:00
John Spurlock
330dfa7d11 Merge "Fix @see link in DocumentsContract docs." into klp-docs 2013-11-25 23:25:36 +00:00
John Spurlock
4e55a7e8c5 Fix @see link in DocumentsContract docs. 
DocumentsContract#createDocument is hidden.

Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
 2013-11-25 18:00:07 -05:00
John Spurlock
56979b2234 am 125d133b: Fix bad @see links in Intent.java. 
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
  Fix bad @see links in Intent.java.
 2013-11-25 18:39:33 +00:00
Geoff Mendal
3b6fa618ce am 7a4adedf: (-s ours) Import translations. DO NOT MERGE 
* commit '7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
  Import translations. DO NOT MERGE
 2013-11-25 10:37:07 -08:00
Geoff Mendal
7a4adedf0a Import translations. DO NOT MERGE 
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
 2013-11-25 09:42:45 -08:00
John Spurlock
125d133bcc Fix bad @see links in Intent.java. 
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
 2013-11-25 11:58:37 -05:00
Dirk Dougherty
0b492138c7 am 6000f1ed: Re-enable samples browser. 
* commit '6000f1ed3d402e3136df173d987c901cc3cc1ff2':
  Re-enable samples browser.
 2013-11-23 20:28:04 +00:00
Dirk Dougherty
6000f1ed3d Re-enable samples browser. 
Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab
 2013-11-22 14:01:48 -08:00
Dirk Dougherty
a050110572 am 9eaa9443: Disable samples browsing temporarily. 
* commit '9eaa94439121f6cb03bff8ecf0acbcbc74442f2d':
  Disable samples browsing temporarily.
 2013-11-22 18:55:28 +00:00
Dirk Dougherty
9eaa944391 Disable samples browsing temporarily. 
Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e
 2013-11-22 10:46:22 -08:00
Dirk Dougherty
8b5da35670 am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs 
* commit '1448d3cd81a685c68b0102e8303c0db4e6e5668f':
  Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
 2013-11-22 18:38:20 +00:00
Dirk Dougherty
1448d3cd81 Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs 2013-11-22 18:36:03 +00:00
Jeff Brown
263c431017 am ce468a35: Stop wifi display discovery when no longer needed. 
* commit 'ce468a35b388ca46578934706b38dbae94941643':
  Stop wifi display discovery when no longer needed.
 2013-11-21 19:43:00 -08:00
Jeff Brown
ce468a35b3 Stop wifi display discovery when no longer needed. 
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.

Suspend wifi display scans while connecting or connected to a remote
display.  This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.

Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.

Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.

Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.

Improved connection reliability somewhat.  It seems that discovery must
already be in progress in order for a connection attempt to succeed.

Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.

Bug: 11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
 2013-11-21 19:32:59 -08:00
Dirk Dougherty
5c678cedb5 Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration. 
Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067
 2013-11-21 18:39:57 -08:00
Newton Allen
27bd44401e am 28029658: Fix javadoc typo in SparseArray. 
* commit '2802965888566244d8642ba32775b7b2a3cec655':
  Fix javadoc typo in SparseArray.
 2013-11-21 23:28:28 +00:00
Newton Allen
2802965888 Fix javadoc typo in SparseArray. 
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit ebb47950f21d3c41955a591000dfb1f195e746fe)
 2013-11-21 23:12:32 +00:00
Dianne Hackborn
2c082ae3d2 am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade 
* commit '90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
 2013-11-21 14:08:00 -08:00
Dianne Hackborn
90e9b1d3dc Fix issue #11790471: Crash removed home buttons and notification bar/shade 
Whoops persistent processes are, well, persistent.  Don't remove
services from them.  We'll be keeping that process record around.

Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b
 2013-11-21 12:56:03 -08:00
Svetoslav Ganov
b95d6f549b am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 
* commit 'c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
  Revert "PreferenceFragment showing the breadcrumb when not needed."
 2013-11-21 12:15:22 -08:00
Svetoslav Ganov
4ed5f502a7 am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 
* commit '4d159661f453fa5d04698033f4bf6256f0d3c16a':
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
 2013-11-21 12:15:19 -08:00
Svetoslav Ganov
c6db9c3b37 Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 2013-11-21 20:12:13 +00:00
Svetoslav Ganov
4d159661f4 Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 2013-11-21 20:12:02 +00:00
Dirk Dougherty
a40420c9c1 am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 19:49:46 +00:00
Dirk Dougherty
43eea0a640 Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 2013-11-21 19:45:46 +00:00
Svetoslav Ganov
8fc552e695 Revert "PreferenceFragment showing the breadcrumb when not needed." 
This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.

Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
 2013-11-21 19:36:22 +00:00
Svetoslav Ganov
68e7f13e22 Revert "PreferencesFragment showing the breadcrumb area in single pane mode." 
This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0.

Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d
 2013-11-21 19:33:53 +00:00
Katie McCormick
de70d796a5 am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs 
* commit '4181da02966255cc50e6a0af3e9fba38812abc8a':
  Doc update: Minor additions to storage doc
 2013-11-21 19:29:32 +00:00
Katie McCormick
4181da0296 Merge "Doc update: Minor additions to storage doc" into klp-docs 2013-11-21 19:26:36 +00:00
Katie McCormick
546f0af6be Doc update: Minor additions to storage doc 
Change-Id: I59aa961a94393221be3c5f847a9fc82aa43e3a6f
 2013-11-21 11:17:02 -08:00
Geoff Mendal
735f915de6 am 35f097a7: (-s ours) Import translations. DO NOT MERGE 
* commit '35f097a7bf4f30d0006221e9ae376ab85ab6937a':
  Import translations. DO NOT MERGE
 2013-11-21 10:53:28 -08:00
Geoff Mendal
35f097a7bf Import translations. DO NOT MERGE 
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
 2013-11-21 10:42:03 -08:00
Dirk Dougherty
e8d820b5a3 am 58c168a1: Merge "Doc change: update download progress image." into klp-docs 
* commit '58c168a1b934c61472176d6de3cfa8996953126c':
  Doc change: update download progress image.
 2013-11-21 18:29:38 +00:00
Dirk Dougherty
58c168a1b9 Merge "Doc change: update download progress image." into klp-docs 2013-11-21 18:26:06 +00:00
Dirk Dougherty
e5957c80d5 Doc change: update download progress image. 
Change-Id: Ib0a4a00cc69a5fa6c552f70aaf40a682e539c41e
 2013-11-21 09:49:40 -08:00
Dirk Dougherty
491b40d752 Doc change: Change description for BRAND. 
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
 2013-11-21 09:31:40 -08:00
Jeff Brown
d2a0192bf2 am b40ce4b8: Make action bar media router icons blue again. 
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.
 2013-11-20 16:48:52 -08:00
Scott Main
9f229afd23 am 93fd2d0e: add Google+ links to support page bug: 7143885 
* commit '93fd2d0ea771e08f5ae124120875fb779010b87a':
  add Google+ links to support page bug: 7143885
 2013-11-21 00:29:41 +00:00
Scott Main
93fd2d0ea7 add Google+ links to support page 
bug: 7143885

Change-Id: I200d7b84694169e5adf2d13a0b6f2c56ab76a727
 2013-11-20 15:33:33 -08:00
Jeff Brown
b40ce4b8e8 Make action bar media router icons blue again. 
This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.

Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
 2013-11-20 15:27:43 -08:00
Chong Zhang
6b0653ffad am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev 
* commit 'bfdecccc48ef2fd9bfb19d77be2492f22971fed9':
  Only scan for wifi display when there is no active connections
 2013-11-20 14:27:44 -08:00
Chong Zhang
bfdecccc48 Merge "Only scan for wifi display when there is no active connections" into klp-dev 2013-11-20 22:24:21 +00:00
Baligh Uddin
ed95cabf4c am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bc77af5b4c2161d7bc1e2de7dc472f343d7f9581':
  Import translations. DO NOT MERGE
 2013-11-20 13:11:58 -08:00
Baligh Uddin
bc77af5b4c Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-20 21:08:31 +00:00
Scott Main
383ce297d7 am 3aec4328: add Analytics event tracking for Studio download 
* commit '3aec4328da1e02993517ddc9c119aca24c7ce680':
  add Analytics event tracking for Studio download
 2013-11-20 21:02:38 +00:00
Scott Main
3aec4328da add Analytics event tracking for Studio download 
Change-Id: I85c2db10d431f32316eabdae5d37e03afd7e83bf
 2013-11-20 12:51:28 -08:00
Scott Main
4dcf23b6f5 am 64fedb77: add new video button to some pages 
* commit '64fedb7725f082ce6bde94c3599d2e7c203ae077':
  add new video button to some pages
 2013-11-20 20:39:15 +00:00