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

120352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dirk Dougherty
a9a39d6ca2 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 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-20 02:16:21 +00:00
Dirk Dougherty
acca12faea Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 2013-11-20 02:13:48 +00:00
Dirk Dougherty
5f0462a4f5 Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs. 
Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
 2013-11-19 17:55:49 -08:00
Katie McCormick
7a7563c0bd am a99e486c: am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit 'a99e486c3a45c2ba96bce7a994e3b91f17b5f75f':
  Doc update: redo of new API Console steps.
 2013-11-19 17:16:27 -08:00
Katie McCormick
a99e486c3a am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit '26574688b627f5b5d722834d73cba5f37185770f':
  Doc update: redo of new API Console steps.
 2013-11-19 17:14:14 -08:00
Katie McCormick
26574688b6 am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit '39711934023b088887a08d833674170938f82a7d':
  Doc update: redo of new API Console steps.
 2013-11-20 01:10:37 +00:00
Katie McCormick
3971193402 Merge "Doc update: redo of new API Console steps." into klp-docs 2013-11-20 01:07:56 +00:00
Tim Murray
d5d37170dd Merge "Convert Java/JNI to 64-bit, part 1." 2013-11-20 00:47:47 +00:00
Glenn Kasten
2a4768c735 KeypressInvalid_48k.ogg was 44.1 kHz previously 
Command:
oggenc --resample 48000 -o ogg/KeypressInvalid_48k.ogg KeypressInvalid.wav

Change-Id: I862ba47f41eee8b6668cd45b9322f164fd652a7f
 2013-11-19 16:40:06 -08:00
Svetoslav
8ef0c14858 Print service meta-data changes not handled properly. 
The package monitor in the PrintManagerService was not overriding
the correct callback to capture changes in the print service package
including meta-data. Hence, there was a missed signal the the old
meta-data was used.

The implication is that if a vendor adds new feature such as custom
print options activity or print service settings that were not there
before, then they will not be show until the device reboots.

bug:11772977

Change-Id: Idf756c430f30ae6d16760a257c199a72a52cf5c5
 2013-11-19 16:25:29 -08:00
Katie McCormick
6b372626e9 Doc update: redo of new API Console steps. 
Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838
 2013-11-19 16:17:17 -08:00
Tim Murray
eff663f391 Convert Java/JNI to 64-bit, part 1. 
This converts context and device storage to use long instead of int.

bug 11332320

Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
 2013-11-19 14:21:58 -08:00
Christopher Tate
266f48cc04 am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
  Harden against transiently unavailable backup transports
 2013-11-19 11:53:02 -08:00
Christopher Tate
c8ea38fe18 am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
  Harden against transiently unavailable backup transports
 2013-11-19 11:48:50 -08:00
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
 2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
 2013-11-19 11:24:46 -08:00
Joe Fernandez
79992ca077 am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs 
* commit 'f52450b1f174eac239ffac67774960d547e295c8':
  Systrace doc updates
 2013-11-19 11:20:41 -08:00