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

175615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
Geoff Mendal
63aa80f6ed am 57086523: (-s ours) Import translations. DO NOT MERGE 
* commit '57086523d593e04db69e5ed75987c669b809176b':
  Import translations. DO NOT MERGE
 2014-11-26 18:43:39 +00:00
Paul Jensen
f19f90b229 am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit '58a493accfeafa13fd77a16e832c5ad72a4c9006':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 18:43:29 +00:00
Jinsuk Kim
e4d336eb95 am 3052fede: am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 
* commit '3052fede8860724a225b49c31ffbb0aa3fd4707b':
  CEC: Do not compare active input when updating
 2014-11-26 18:43:12 +00:00
Andy Hung
e356600772 am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 
* commit 'feeaa0ba547188453b668a2b1ef80fd6c7dd3a9a':
  Allow set loop and position before write for static AudioTracks
 2014-11-26 18:42:44 +00:00
Dianne Hackborn
5f84109cae am b3cf1136: am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev 
* commit 'b3cf1136d0d03e82517bf887eef91ce26a7c23bb':
  Re-tune low memory killer params.
 2014-11-26 18:42:02 +00:00
smain@google.com
804830f83c am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '357efcd1d9b23036bd4e858155696ed2ed27f5dc':
  add wear design guide for contextual apps
 2014-11-26 18:41:53 +00:00
Alan Viverette
7c28a9682b am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit 'c8361ba78eac66c49d92ff4be36ef23889846ea9':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 18:41:41 +00:00
Alan Viverette
ed79856db2 am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 18:41:35 +00:00
Alan Viverette
93ca215bf4 am 8311f4d5: am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 
* commit '8311f4d5c6370a7d816f67a9a71a07d6a7fc18c4':
  Ensure time picker HH:MM header is laid out left-to-right
 2014-11-26 18:41:25 +00:00
padarshr
3eafd910c9 am 3e39c7f5: am e3c48e90: am ddd9c2b9: am 1586b9c3: Start MountService before performBootDexOpt 
* commit '3e39c7f50c0fbc8df449dbb17dbb3c626935740e':
  Start MountService before performBootDexOpt
 2014-11-26 18:41:17 +00:00
Alan Viverette
e56848431e am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'e6974e32e740f9801b5023695881a80df0b363f6':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-26 18:41:06 +00:00
Jeff Sharkey
b802cd6767 Merge "APK still has privileged flag after being moved from "/system/priv-app"" 2014-11-26 18:35:11 +00:00
Ignacio Solla
c67b21fa3f Merge "[WebView] Allow the WebView to be compiled against the system SDK." 2014-11-26 18:31:01 +00:00
Conley Owens
58025866d8 am e1fe4fa4: am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE" 
* commit 'e1fe4fa43171e91eacc883ed6269b859d6816520':
  RRO tests: fix potential NPE
 2014-11-26 18:22:09 +00:00
Conley Owens
70d6cd9448 am ea796d70: am c657b302: am ed23786c: Merge "RRO tests: adapt tests to split apks" 
* commit 'ea796d7028aec09399a4e7c3661a18aaaedf523a':
  RRO tests: adapt tests to split apks
 2014-11-26 18:22:04 +00:00
Craig Mautner
b66b12948d am dae55017: am 1c48e302: am a7a99981: Merge "Fix Presentation window is removed on stack change" 
* commit 'dae55017d828b3a74f272298bc604e93e039b0d0':
  Fix Presentation window is removed on stack change
 2014-11-26 18:21:59 +00:00
Craig Mautner
a1c489fe67 am b4488629: am f9819b01: am 17fc8574: Merge "Sync focus stack frame and layer with focus app." 
* commit 'b4488629815002cdb00d7c9d5cabbe07f802fd1d':
  Sync focus stack frame and layer with focus app.
 2014-11-26 18:21:55 +00:00
Craig Mautner
bcab95524d am b64b1dc8: am 77f8112d: am aed35d6b: Merge "Not include fullscreen opaque window on screenshot" 
* commit 'b64b1dc8a1d65d352cebe86918501b13f1c03e1e':
  Not include fullscreen opaque window on screenshot
 2014-11-26 18:21:50 +00:00
Craig Mautner
230ddb6203 am b6dc3ff2: am 6c3548a9: am e7648472: Merge "Measure absolute value of pointer motion distance" 
* commit 'b6dc3ff286ad742bfa0b86dd8673467fbcaa95c2':
  Measure absolute value of pointer motion distance
 2014-11-26 18:21:45 +00:00
Kenny Root
5c4f9d4d5c am cd04bb4f: am 3476a2a0: am 564ec716: Merge "Track change to Conscrypt" 
* commit 'cd04bb4fc4e999ff82732481b29e7b221b61c883':
  Track change to Conscrypt
 2014-11-26 18:21:41 +00:00
Conley Owens
e1fe4fa431 am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE" 
* commit '6a53bd9ddbff5dcccec3cd3928e10317007031d3':
  RRO tests: fix potential NPE
 2014-11-26 18:14:34 +00:00
Conley Owens
ea796d7028 am c657b302: am ed23786c: Merge "RRO tests: adapt tests to split apks" 
* commit 'c657b302e5744e7de9ca142126ba3b428ce5a143':
  RRO tests: adapt tests to split apks
 2014-11-26 18:14:28 +00:00
Craig Mautner
dae55017d8 am 1c48e302: am a7a99981: Merge "Fix Presentation window is removed on stack change" 
* commit '1c48e3029b41efea764520fee32c9085d1162a24':
  Fix Presentation window is removed on stack change
 2014-11-26 18:14:22 +00:00
Craig Mautner
b448862981 am f9819b01: am 17fc8574: Merge "Sync focus stack frame and layer with focus app." 
* commit 'f9819b011983f974f481b83a7e80d00569968900':
  Sync focus stack frame and layer with focus app.
 2014-11-26 18:14:15 +00:00
Craig Mautner
b64b1dc8a1 am 77f8112d: am aed35d6b: Merge "Not include fullscreen opaque window on screenshot" 
* commit '77f8112d526b60ccdc099dd418c8955d47b5418d':
  Not include fullscreen opaque window on screenshot
 2014-11-26 18:14:08 +00:00
Craig Mautner
b6dc3ff286 am 6c3548a9: am e7648472: Merge "Measure absolute value of pointer motion distance" 
* commit '6c3548a961db7b07ae4bbca1dae0a1b9f12e525d':
  Measure absolute value of pointer motion distance
 2014-11-26 18:14:02 +00:00
Kenny Root
cd04bb4fc4 am 3476a2a0: am 564ec716: Merge "Track change to Conscrypt" 
* commit '3476a2a0b2eea94e695a087fa0582bf128e8761b':
  Track change to Conscrypt
 2014-11-26 18:13:55 +00:00
Eric Laurent
2706cb804a am 24a9ddde: am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit '24a9ddde72262312d03fe733855660f2e61947b2':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-26 18:10:09 +00:00
Roozbeh Pournader
983cb42cab am 77bcf296: am 779c8ad6: am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit '77bcf2962bc0eb1c0ee3bd232931bcb1198f120e':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-26 18:10:04 +00:00
Ryan Lothian
d550f9028e Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
 2014-11-26 18:04:45 +00:00
Conley Owens
6a53bd9ddb am 69d28437: Merge "RRO tests: fix potential NPE" 
* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE
 2014-11-26 18:02:45 +00:00
Conley Owens
c657b302e5 am ed23786c: Merge "RRO tests: adapt tests to split apks" 
* commit 'ed23786cc5b19c66c526a576dd39dba720fa5340':
  RRO tests: adapt tests to split apks
 2014-11-26 18:02:38 +00:00
Eric Laurent
24a9ddde72 am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit '297222315e90021497eee4ef6014f463fab96c6a':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-26 18:01:04 +00:00
Roozbeh Pournader
77bcf2962b am 779c8ad6: am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit '779c8ad67957d0b0c0851226c2ed96df418037ae':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-26 18:00:59 +00:00
Conley Owens
69d28437d3 Merge "RRO tests: fix potential NPE" 2014-11-26 17:57:09 +00:00
Craig Mautner
1c48e3029b am a7a99981: Merge "Fix Presentation window is removed on stack change" 
* commit 'a7a999816fed3e0bdd8e65a9b90f7fad2ca5ae16':
  Fix Presentation window is removed on stack change
 2014-11-26 17:57:02 +00:00
Conley Owens
ed23786cc5 Merge "RRO tests: adapt tests to split apks" 2014-11-26 17:56:48 +00:00
Craig Mautner
a7a999816f Merge "Fix Presentation window is removed on stack change" 2014-11-26 17:53:00 +00:00
Geoff Mendal
42acb72827 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 17:50:35 +00:00
Geoff Mendal
f48b2c3315 Import translations. DO NOT MERGE 
Change-Id: I38db67398ca1e059fd1df6e89b7b1cd3894cd22b
Auto-generated-cl: translation import
 2014-11-26 09:48:56 -08:00
Craig Mautner
f9819b0119 am 17fc8574: Merge "Sync focus stack frame and layer with focus app." 
* commit '17fc8574e55d542744f22e34bf1103bcfbefbc27':
  Sync focus stack frame and layer with focus app.
 2014-11-26 17:48:16 +00:00
Eric Laurent
4c3fc59b4d AudioRecord JNI: pass attributes to native AudioRecord. 
Bug: 16006090.
Change-Id: Ic6448dda0de65dada3a195cfc2ec73698b04b7b2
 2014-11-26 09:46:44 -08:00
Craig Mautner
17fc8574e5 Merge "Sync focus stack frame and layer with focus app." 2014-11-26 17:43:30 +00:00
Craig Mautner
77f8112d52 am aed35d6b: Merge "Not include fullscreen opaque window on screenshot" 
* commit 'aed35d6b57b4076b9b405c384f6d1f65253ab2b0':
  Not include fullscreen opaque window on screenshot
 2014-11-26 17:41:57 +00:00
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
6c3548a961 am e7648472: Merge "Measure absolute value of pointer motion distance" 
* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance
 2014-11-26 17:31:08 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +00:00
dcashman
9fd6d9d995 Merge "Remove if(true) line." 2014-11-26 17:23:01 +00:00
dcashman
0e0dbf9367 Merge "Prevent EntropyMixer from registering with service manager." 2014-11-26 17:17:00 +00:00