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

137913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
e4a369d1f8 am 02dc5023: Handle Zen Mode computations correctly for updated notifications. 
* commit '02dc50231e5a3d5754281f819df418793260f526':
  Handle Zen Mode computations correctly for updated notifications.
 2014-06-04 18:08:52 +00:00
Chris Wren
30591cc1ab am 1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev 
* commit '1e58ac1d71b630435c3e69180d9e92662c6f65dd':
  Apply Zen Mode later, after we've found the old record.
 2014-06-04 18:08:48 +00:00
Jorim Jaggi
d5375b9548 am d98ab64e: Merge "Animate unlock icon while unlocking." into lmp-preview-dev 
* commit 'd98ab64eeb3f12db6a0664dbd3871abe1d18452a':
  Animate unlock icon while unlocking.
 2014-06-04 18:08:43 +00:00
Jorim Jaggi
8f68ed6959 am 4aeb033a: Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev 
* commit '4aeb033aff7259cbffe01931902a9b520ab4648f':
  Fix fake status bar not visible in SHADE_LOCKED state.
 2014-06-04 18:08:28 +00:00
Alan Viverette
d9ec3dafa0 am b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev 
* commit 'b1c7f7f538e8c4947f75406cc6089f6680f59a31':
  Fix NPE when ripples are canceled due to visibility change
 2014-06-04 18:08:22 +00:00
Winson Chung
59255e3c63 am 7b7f89fb: Merge "Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)" into lmp-preview-dev 
* commit '7b7f89fb4b08e81c80821078f92c908f80b21e1e':
  Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)
 2014-06-04 18:08:08 +00:00
Tim Murray
1199d87a05 am dddd2625: (-s ours) am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'dddd2625585c80a16f47ef9322a5dee93094c9df':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:59:53 +00:00
Tim Murray
dddd262558 am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'af2e7bc2e0784efd883b495a20aaffa374e8a840':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:56:02 +00:00
Andrew Solovay
478738068f am 750d537a: am c2086e09: am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '750d537acf9f76f8dee18bf256b8ebbac4c460bc':
  docs: Fixed error in code sample.
 2014-06-04 17:54:38 +00:00
Ricardo Cervera
d893701ffb am d53f1bd0: am 234474d5: am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit 'd53f1bd0e4a00677c12d38cfd525b5592d352fd7':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:54:30 +00:00
Andrew Solovay
750d537acf am c2086e09: am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit 'c2086e09df1fa5b0f147f9474a9dd924f487468f':
  docs: Fixed error in code sample.
 2014-06-04 17:43:24 +00:00
Andrew Solovay
c2086e09df am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '15ceb87a07d9ad1fba4265112492e34c5cc360f5':
  docs: Fixed error in code sample.
 2014-06-04 17:40:03 +00:00
Tim Murray
af2e7bc2e0 am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'fdb15a76a30de169aac63d4c2260aa293477557e':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:39:54 +00:00
Andrew Solovay
15ceb87a07 am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
  docs: Fixed error in code sample.
 2014-06-04 17:35:45 +00:00
Ricardo Cervera
d53f1bd0e4 am 234474d5: am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '234474d565e668935a97bc6719ddee5c6d8d8b43':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:34:06 +00:00
Andrew Solovay
2e10cc9021 Merge "docs: Fixed error in code sample." into klp-docs 2014-06-04 17:32:46 +00:00
Ricardo Cervera
234474d565 am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '693a954626866e40b01264ff57fe6c336a7504a8':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:29:36 +00:00
Tim Murray
fdb15a76a3 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-04 10:25:54 -07:00
Ricardo Cervera
693a954626 am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:24:35 +00:00
Ricardo Cervera
6e949d9ca5 Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 2014-06-04 17:21:39 +00:00
Hector Dearman
13d6cfb3b5 Merge "Removes bad comment from CookieManager" 2014-06-04 17:12:36 +00:00
Robert Greenwalt
4806c12711 am e8f910c6: Fix Legacy NetworkInfo API 
* commit 'e8f910c635710e4b2d7f299ba33f6205cc4371e3':
  Fix Legacy NetworkInfo API
 2014-06-04 17:03:25 +00:00
Jorim Jaggi
43cb6b1a45 am ec90358d: Improve hint animations. 
* commit 'ec90358dbca10cdc6a162ef42baddbf509614f14':
  Improve hint animations.
 2014-06-04 17:03:18 +00:00
Jorim Jaggi
1b002210e1 am b1c204fe: Hint for phone and camera. 
* commit 'b1c204fe534cc17a8a801e50a83ab747e94d4472':
  Hint for phone and camera.
 2014-06-04 17:03:12 +00:00
Jorim Jaggi
bff6251f43 am a573bcb6: Hide phone/camera affordance when unlocking. 
* commit 'a573bcb69bae182da33f3a7be830eaf9995f817e':
  Hide phone/camera affordance when unlocking.
 2014-06-04 17:03:05 +00:00
Adrian Roos
542681732b am 8d0c8451: (-s ours) Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev 
* commit '8d0c84512cb1d1fa7b2be072df0b8d9c1e16d837':
  Disable now defunct touch analysis facility - DO NOT MERGE
 2014-06-04 17:03:01 +00:00
Jungshik Jang
cebb5d1b4b am 20909bb0: (-s ours) Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev 
* commit '20909bb03bf636c6168ad19ccb481c7961fdb8a4':
  DO NOT MERGE: Added missing entries in the cec device array
 2014-06-04 17:02:32 +00:00
Evan Charlton
065ec0f7ae am 44f3a86a: (-s ours) Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev 
* commit '44f3a86a67fc46065c1d17c1048694e880b87b30':
  Revert sendEnvelope changes [DO NOT MERGE]
 2014-06-04 17:02:10 +00:00
Wei Wang
2fabda1906 am 283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev 
* commit '283a223371df58274fdc4380f9710511775eecc5':
  Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925.
 2014-06-04 17:02:02 +00:00
Robert Greenwalt
77fa242097 am ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev 
* commit 'ead9aa35d4f5b94d9d602247826ba97afe2b6791':
  Refactor NetworkFactory.
 2014-06-04 17:01:56 +00:00
Dongwon Kang
450758a55c am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev 
* commit '65d95bfa011fa50e50403f41e08afa2af5d9746e':
  Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
 2014-06-04 17:01:47 +00:00
Robert Ly
78b13b219f am f4220ca1: am f4f105f1: am dd57a6b2: am bb33ff04: update device dashboard for June 
* commit 'f4220ca1fae79cb1cf2b9edeefe6462f3be2546d':
  update device dashboard for June
 2014-06-04 17:01:11 +00:00
Robert Ly
f4220ca1fa am f4f105f1: am dd57a6b2: am bb33ff04: update device dashboard for June 
* commit 'f4f105f1615d61b9e5e63b2bd5184d54987b3bba':
  update device dashboard for June
 2014-06-04 16:57:39 +00:00
Robert Ly
f4f105f161 am dd57a6b2: am bb33ff04: update device dashboard for June 
* commit 'dd57a6b24d819bbfd9d2422f52dfb0fe9d43b3e9':
  update device dashboard for June
 2014-06-04 16:54:45 +00:00
Robert Ly
dd57a6b24d am bb33ff04: update device dashboard for June 
* commit 'bb33ff04b7d1f7f554331426bd9940edbbfd395d':
  update device dashboard for June
 2014-06-04 16:50:26 +00:00
vandwalle
059a9ca35e am aca37776: handle removal of self added configurations 
* commit 'aca3777661f2e29d5cca60a8a11dea2878eae6e5':
  handle removal of self added configurations
 2014-06-04 16:45:13 +00:00
Robert Greenwalt
2f4188c8a0 am 5fc756c3: (-s ours) Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev 
* commit '5fc756c3f4b7203d53834b9750332325ebf4e92d':
  Rewrite startUsingNetworkFeature for new API
 2014-06-04 16:45:02 +00:00
Robert Ly
bb33ff04b7 update device dashboard for June 
Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765
 2014-06-04 09:27:18 -07:00
Florin Malita
676f92e9a7 Merge "Canvas JNI cleanup." 2014-06-04 16:04:45 +00:00
Florin Malita
95d49149cc Canvas JNI cleanup. 
As pointed out in a previous patch review, some native Canvas methods do not
receive a native canvas handle and instead have to use GraphicsJNI to query
the object mNativeCanvasWrapper field.

To avoid the extra JNI call, this change adds the missing Java wrapper
methods and ensures that all native calls are passed efficient native
handles.

Also, some native methods are consolidated: save, saveAll -> save,
clipRect* -> clipRect.

Change-Id: I2eae4a633f6a463d9fbae2ca632661acc8b5cfc3
 2014-06-04 11:09:18 -04:00
Leon Scroggins III
a578ab00c4 Merge "Ignore inPurgeable and inInputShareable." 2014-06-04 14:04:18 +00:00
Yohei Yukawa
9e8df26f3b Merge "Hardening token validation in InputMethodManagerService" 2014-06-04 12:47:07 +00:00
Katie McCormick
000e574037 am c799a830: am 88d1c560: am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit 'c799a830b2d29db5747cc89558c9effb6baddb22':
  Doc update: new Volley class
 2014-06-04 12:40:48 +00:00
Katie McCormick
c799a830b2 am 88d1c560: am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit '88d1c560ea797e3ec974fd735531c126f8453a64':
  Doc update: new Volley class
 2014-06-04 12:36:21 +00:00
Katie McCormick
88d1c560ea am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit 'ea5fa98c7c381a37c113b7d2efdd6a406d902949':
  Doc update: new Volley class
 2014-06-04 12:32:09 +00:00
Katie McCormick
ea5fa98c7c am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit 'c659e7465df342920f3906cbc0b024f610bf65bd':
  Doc update: new Volley class
 2014-06-04 12:26:44 +00:00
Yohei Yukawa
a07557471e Hardening token validation in InputMethodManagerService 
This CL adds missing token validations in
InputMethodManagerService#switchToNextInputMethod and
InputMethodManagerService#shouldOfferSwitchingToNextInputMethod.

This CL also fixes a possible race condition when validating
the token in InputMethodManagerService#updateStatusIcon.

BUG: 15420379
Change-Id: I043aa30a19c821f33effd57dfd6590b0e3ed817b
 2014-06-04 21:15:31 +09:00
Katie McCormick
c659e7465d Merge "Doc update: new Volley class" into klp-docs 2014-06-04 12:01:39 +00:00
Yohei Yukawa
43eb101227 Merge "Remove code duplication in InputMethodManagerService" 2014-06-04 11:24:31 +00:00
Yohei Yukawa
22c97be73b Remove code duplication in InputMethodManagerService 
This is a groundwork for the subsequent fix. It should not change
existing behavior.

BUG: 15420379
Change-Id: I106b3f50731c799e06b26d1eab9c6a406c06d78c
 2014-06-04 19:45:18 +09:00