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

120369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Derek Sollenberger
f8627d658d Merge "framework changes needed to support Skia at r12108." 2013-11-21 15:04:03 +00: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
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
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
f78e78f5b1 am 05194598: am 4dcf23b6: am 64fedb77: add new video button to some pages 
* commit '051945986f325a0dfce13a98ade7d1c60cc7d185':
  add new video button to some pages
 2013-11-20 12:46:06 -08:00
Scott Main
051945986f am 4dcf23b6: am 64fedb77: add new video button to some pages 
* commit '4dcf23b6f50aa5c43e6c7e86cb4b14caa669e954':
  add new video button to some pages
 2013-11-20 12:41:41 -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
Scott Main
64fedb7725 add new video button to some pages 
Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5
 2013-11-20 12:34:43 -08:00
Derek Sollenberger
ed79ff0026 framework changes needed to support Skia at r12108. 
Change-Id: I231e187e7d2db84fa06bd6783c9b49abba5b4e70
 2013-11-20 14:50:51 -05:00
Tim Murray
460a04971c Convert Java/JNI to 64-bit, part 2. 
This changes BaseObj to support 64-bit IDs. There are a few caveats:

1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.

bug 11332320

Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
 2013-11-20 10:18:04 -08:00
Baligh Uddin
7ef02b9d18 Import translations. DO NOT MERGE 
Change-Id: Iedcc1fc7c75f1bf5b97991aacbbe1c2f00aaf906
Auto-generated-cl: translation import
 2013-11-20 09:53:11 -08:00
Baligh Uddin
9b38499c56 Import translations. DO NOT MERGE 
Change-Id: I499aa31a9f0e9a997d5e60eb778f16bc3b497663
Auto-generated-cl: translation import
 2013-11-20 09:50:34 -08:00
Baligh Uddin
c4f00c63e1 Import translations. DO NOT MERGE 
Change-Id: I40eef5497c33e91306b1967b9d31aff9ebd137da
Auto-generated-cl: translation import
 2013-11-20 09:44:54 -08:00
Baligh Uddin
a5153f0cd5 am 3e0dfecb: (-s ours) am 521b85f4: (-s ours) am 853251e7: (-s ours) Import translations. DO NOT MERGE 
* commit '3e0dfecb0835a6945f5a352d46308f0844303643':
  Import translations. DO NOT MERGE
 2013-11-20 09:44:21 -08:00
Baligh Uddin
3e0dfecb08 am 521b85f4: (-s ours) am 853251e7: (-s ours) Import translations. DO NOT MERGE 
* commit '521b85f4e60ad5058662b59ba5986edf3f7538ea':
  Import translations. DO NOT MERGE
 2013-11-20 09:41:49 -08:00
Baligh Uddin
521b85f4e6 am 853251e7: (-s ours) Import translations. DO NOT MERGE 
* commit '853251e74f3e603f3431a3317b4d27ee042a4eb1':
  Import translations. DO NOT MERGE
 2013-11-20 09:37:51 -08:00
Baligh Uddin
853251e74f Import translations. DO NOT MERGE 
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
 2013-11-20 09:17:20 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
George Mount
34d8519de4 Merge "Add animations along a Path." 2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54 Add animations along a Path. 
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
 2013-11-20 07:39:26 -08:00
Chong Zhang
a68c87eda8 Only scan for wifi display when there is no active connections 
Bug: 11717053
Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0
 2013-11-19 19:56:16 -08:00
Dirk Dougherty
7acec30ac7 am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 
* commit '3d763e258b6643d29a495b5dfb1cb376e6b61f87':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-19 18:24:20 -08:00
Dirk Dougherty
3d763e258b am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 
* commit 'a9a39d6ca25796ba0fcf16ead3a9928f36b6444d':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-19 18:20:40 -08:00