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

120495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
64fe2b3a33 am 3eddb621: am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '3eddb6213dc017c78e6d641f7f4a4685db09851e':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:57:32 -08:00
Dirk Dougherty
3eddb6213d am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit 'a40420c9c1c8216fd0251dc550bb22e9cc1dd177':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:53:27 -08: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
Katie McCormick
9514bb7d17 am f49578ad: am de70d796: am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs 
* commit 'f49578adff1f79520ce9fafea98d4abe371b1ec0':
  Doc update: Minor additions to storage doc
 2013-11-21 11:39:50 -08: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
Katie McCormick
f49578adff am de70d796: am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs 
* commit 'de70d796a564ca3cc833def566f83880be5b573f':
  Doc update: Minor additions to storage doc
 2013-11-21 11:35:56 -08: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
e88ac9437f am 3c1004f1: (-s ours) am 735f915d: (-s ours) am 35f097a7: (-s ours) Import translations. DO NOT MERGE 
* commit '3c1004f1a69b1723396f77615333cc880d2d5343':
  Import translations. DO NOT MERGE
 2013-11-21 10:59:47 -08:00
Geoff Mendal
3c1004f1a6 am 735f915d: (-s ours) am 35f097a7: (-s ours) Import translations. DO NOT MERGE 
* commit '735f915de647b4df9370f6e16a5b9a6bfc6c358f':
  Import translations. DO NOT MERGE
 2013-11-21 10:56:15 -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
a239df052f am 577a2531: am e8d820b5: am 58c168a1: Merge "Doc change: update download progress image." into klp-docs 
* commit '577a2531b5f0ad9641586d568406dc7407e17bc2':
  Doc change: update download progress image.
 2013-11-21 10:38:10 -08:00
Dirk Dougherty
577a2531b5 am e8d820b5: am 58c168a1: Merge "Doc change: update download progress image." into klp-docs 
* commit 'e8d820b5a35d42eb77222af0887d72ad23500740':
  Doc change: update download progress image.
 2013-11-21 10:33:37 -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
Craig Mautner
90192a6165 am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()" 
* commit '0495f4eded46efd7035ed672dc933ec6430b93fd':
  Make SurfaceView layers captured by screenshotApplications()
 2013-11-21 08:50:05 -08:00
Craig Mautner
0495f4eded Merge "Make SurfaceView layers captured by screenshotApplications()" 2013-11-21 16:45:29 +00:00
Derek Sollenberger
f8627d658d Merge "framework changes needed to support Skia at r12108." 2013-11-21 15:04:03 +00:00
Sangkyu Lee
7ccba97417 Make SurfaceView layers captured by screenshotApplications() 
Since SurfaceView layers are located below application layers,
SurfaceView is not captured by screenshotApplications()
when the application is running in fullscreen.

Moreover, ws.isFullscreen(dw, dh) returns mostly true
on the devices which do not use the navigation bar.

Change-Id: Ia1036c79054950384a97504714929fd85c8147de
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
 2013-11-21 15:20:33 +09:00
Jeff Brown
96a1f90c37 am f508c2b0: am d2a0192b: am b40ce4b8: Make action bar media router icons blue again. 
* commit 'f508c2b0fbe8ad1c0555db5d47c0812d80b9e367':
  Make action bar media router icons blue again.
 2013-11-20 16:56:29 -08:00
Jeff Brown
f508c2b0fb am d2a0192b: am b40ce4b8: Make action bar media router icons blue again. 
* commit 'd2a0192bf237994f0132625fc00d21896912151e':
  Make action bar media router icons blue again.
 2013-11-20 16:51:07 -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
9ae52de494 am 67360115: am 9f229afd: am 93fd2d0e: add Google+ links to support page bug: 7143885 
* commit '67360115ecbbf0fce8ebfbe47c4f97c132272c38':
  add Google+ links to support page bug: 7143885
 2013-11-20 16:39:09 -08:00
Scott Main
67360115ec am 9f229afd: am 93fd2d0e: add Google+ links to support page bug: 7143885 
* commit '9f229afd2382b15347d1398a6b81c130e1e0021e':
  add Google+ links to support page bug: 7143885
 2013-11-20 16:36:12 -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
Tim Murray
8437967733 Merge "Convert Java/JNI to 64-bit, part 2." 2013-11-20 22:46:47 +00:00
Glenn Kasten
52909212a6 Merge "KeypressInvalid_48k.ogg was 44.1 kHz previously" 2013-11-20 22:39:47 +00:00
Chong Zhang
ab6294e4bb am db44cb92: am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev 
* commit 'db44cb92ecae78f0fa5a8fe60eb1d35393c67507':
  Only scan for wifi display when there is no active connections
 2013-11-20 14:34:00 -08:00
Chong Zhang
db44cb92ec am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev 
* commit '6b0653ffadea757c87724594b70922cd11dcd835':
  Only scan for wifi display when there is no active connections
 2013-11-20 14:30:11 -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
John Spurlock
5d95899881 Merge "Remove unused imports from frameworks/base." 2013-11-20 21:47:52 +00:00
Baligh Uddin
68c5e7a83d am b6c3d5b4: (-s ours) am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b6c3d5b4ac9300fdb2902509ff485feadcae9553':
  Import translations. DO NOT MERGE
 2013-11-20 13:20:44 -08:00
Baligh Uddin
b6c3d5b4ac am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ed95cabf4cd13febec213ad342d947c7c847180c':
  Import translations. DO NOT MERGE
 2013-11-20 13:16:20 -08:00
Nick Kralevich
ac237236ca Add OEM specific addresses 
Add OEM specific security addresses to the Android Security FAQ.
It's a partial list for now, but we'll build this up over time.

Delete the security@android.com hyperlink. I think people are
accidentally clicking on the link, causing empty e-mails to
get sent to us.

Change-Id: If516a15169bd79f45d5aa3bef2b0bd2c6af8f0fa
 2013-11-20 13:13:50 -08: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
Scott Main
89be9b5265 am 214c2503: am 383ce297: am 3aec4328: add Analytics event tracking for Studio download 
* commit '214c250354166ee783aef2ed69aa678880995f46':
  add Analytics event tracking for Studio download
 2013-11-20 13:09:54 -08:00
Baligh Uddin
23821c9961 Merge "Import translations. DO NOT MERGE" 2013-11-20 21:08:39 +00:00
Baligh Uddin
bc77af5b4c Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-20 21:08:31 +00:00
Baligh Uddin
7e78434cbf Merge "Import translations. DO NOT MERGE" 2013-11-20 21:08:22 +00:00
Scott Main
214c250354 am 383ce297: am 3aec4328: add Analytics event tracking for Studio download 
* commit '383ce297d7086e8166aab9607b5101da73486ed1':
  add Analytics event tracking for Studio download
 2013-11-20 13:05:30 -08:00