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

182947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
3d332f4e67 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
 2015-02-24 12:14:06 -05:00
Narayan Kamath
419389c52a am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit 'fd335f8467259410c0a55733331e10531141e76e':
  Remove wrong javadoc comment
 2015-02-24 10:28:12 +00:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
 2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Chad Jones
1fb5528643 resolved conflicts for merge of 57bb5f5c to master 
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
 2015-02-23 21:19:58 -08:00
Chad Brubaker
39fee05ea2 am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f271fa33f148b0c410e8ee06aceb1f2b57cd62c7':
  Add new IKeystoreService methods to KeyStore
 2015-02-24 04:54:41 +00:00
Chad Brubaker
7d0c22e21b am 3576ca1f: am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '3576ca1f9bd1e46101ad940cc5923ac9965cfafe':
  Add Keymaster 0.4 binder API
 2015-02-24 04:54:34 +00:00
Deepanshu Gupta
a13ca400d1 am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '01d5286f388303551a2eb8f57e210f6d7a690cb5':
  Set forceFramework correctly for included layouts.
 2015-02-24 04:52:35 +00:00
Alan Viverette
32adbd3524 Merge "Always apply color filter passed to DrawableContainer.setColorFilter" 2015-02-24 01:22:17 +00:00
Alan Viverette
6f51440a74 Always apply color filter passed to DrawableContainer.setColorFilter 
Bug: 19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
 2015-02-23 17:21:24 -08:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
 2015-02-24 00:46:48 +00:00
Joe LaPenna
c0c395162f Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 2015-02-24 00:37:15 +00:00
Chris Craik
bbcec73309 Merge "Fix atrace saveLayer flag logging" 2015-02-24 00:20:08 +00:00
Chris Craik
a7e5367b5c Fix atrace saveLayer flag logging 
Change-Id: I5da85284c15316c9db4cc74011b855ef8c2f7cdd
 2015-02-23 16:18:38 -08:00
David Friedman
74c6a15493 Merge "resolved conflicts for merge of 6248cdd5 to master" 2015-02-23 23:03:37 +00:00
Mike Lockwood
f3c7276a4f Merge "Add MIDI Manager API tweaks:" 2015-02-23 23:03:36 +00:00
Chad Brubaker
f271fa33f1 am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:53:07 +00:00
Chad Brubaker
3576ca1f9b am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API
 2015-02-23 22:53:01 +00:00
Wale Ogunwale
4b8b226343 Merge "Don't delete home stack when last task is removed." 2015-02-23 22:51:44 +00:00
Chad Brubaker
cdc70256f4 am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:45:11 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
 2015-02-23 22:45:01 +00:00
David Friedman
704ebab343 resolved conflicts for merge of 6248cdd5 to master 
Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b
 2015-02-23 14:40:48 -08:00
Chris Craik
c467adac42 Merge "Simplify Texture member initialization" 2015-02-23 22:39:46 +00:00
Mike Lockwood
b673770f71 Add MIDI Manager API tweaks: 
- Change the package name from android.midi to android.media.midi

- Add option for specifying a Handler for DeviceCallback notifications

Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
 2015-02-23 14:32:23 -08:00
Chad Brubaker
f3c117ca0d Merge "Add new IKeystoreService methods to KeyStore" 2015-02-23 22:20:59 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
e6a461341c Add new IKeystoreService methods to KeyStore 
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
 2015-02-23 14:12:44 -08:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API 
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
 2015-02-23 14:12:37 -08:00
Chris Craik
8e93a7c937 Simplify Texture member initialization 
Change-Id: Iaaa6dd20e64a0a075d732b101e3c4278cad44047
 2015-02-23 13:21:53 -08:00
Alan Viverette
6a8253fdc9 Update progress bar and seek bar backgrounds, fix seek bar thumb 
Ensures LayerDrawable copies out the correct layer properties during
"tileification". This really needs to be deprecated or replaced in a
future CL, though, because it is potentially lossy (e.g. for
RippleDrawable, which is an instanceof LayerDrawable).

Bug: 19448441
Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
 2015-02-23 12:49:47 -08:00
Alan Viverette
b3f3762ee0 Merge "Unify wrapper-type drawables" 2015-02-23 20:39:01 +00:00
James Cook
db871da48f Merge "Improvements to TextView Ctrl-Z undo support" 2015-02-23 20:31:14 +00:00
James Cook
7713d18847 Improvements to TextView Ctrl-Z undo support 
* Undo/redo restores cursor position
* Multiple deletes are consolidated into a single operation
* Don't create undo history for invalid or no-op operations
* Move logic for merging operations into Editor.EditOperation

CTS tests in android.widget.cts.TextViewTest will land separately.

Bug: 19332904
Bug: 19450037
Change-Id: I9c7887aecdd0209e783fb7cda4cb7081a97a98cd
 2015-02-23 12:23:47 -08:00
Deepanshu Gupta
01d5286f38 am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '8f022fd323063f9cebb481be650db40cf5e486f3':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:29:31 +00:00
Deepanshu Gupta
8f022fd323 am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:22:31 +00:00
Mike Lockwood
152d6b2c2c Merge "Add support for USB notification when connected as a MIDI peripheral" 2015-02-23 19:21:58 +00:00
Deepanshu Gupta
5ed4fc9efd am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:15:57 +00:00
Scott Kennedy
7be99fc667 Merge "Add some more @Nullable annotations" 2015-02-23 19:09:19 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:03:29 +00:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
David Friedman
23d8282d34 am 96824427: am 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '96824427e97ea7ef40777239a537a1c7a60fe15d':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:47:38 +00:00
David Friedman
6248cdd588 am 84e40b1f: am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '84e40b1f338eba0a352a6bf3a0f2801c21e17d59':
  Fixes several typos.
 2015-02-23 18:39:53 +00:00
David Friedman
96824427e9 am 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:39:47 +00:00
David Friedman
84e40b1f33 am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48':
  Fixes several typos.
 2015-02-23 18:33:08 +00:00
David Friedman
2c6894685d am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'fcbc842878df5fbe3d8a62add407bb512179e28a':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:33:04 +00:00
David Friedman
d77380b856 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.
 2015-02-23 18:26:10 +00:00
David Friedman
fcbc842878 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:26:06 +00:00
David Friedman
3570268bcf am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.
 2015-02-23 18:20:37 +00:00