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

182927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Wale Ogunwale
4b8b226343 Merge "Don't delete home stack when last task is removed." 2015-02-23 22:51:44 +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
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
David Friedman
f066c2358d am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:20:32 +00:00
David Friedman
09e9076ddf am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.
 2015-02-23 18:13:36 +00:00
David Friedman
18c8a35fa4 am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
 2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Clara Bayarri
6f542f5a40 Merge "Floating toolbars: Encapsulate StandaloneActionMode view creation." 2015-02-23 17:49:47 +00:00
Diego Perez
55f149c753 Merge "Avoid caching mImage on the main render loop and use clipping." 2015-02-23 17:28:39 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts. 
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
 2015-02-23 17:26:12 +00:00
Wale Ogunwale
49853bf1df Don't delete home stack when last task is removed. 
Bug: 19470291
Change-Id: I4a6c24edb6cc83a0f155836ce4e1394807da1563
 2015-02-23 09:24:42 -08:00
Geoff Mendal
1cee9c8bda am c37feed0: (-s ours) am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c37feed0940b0b9b1fdd455c72bc22ae6e579280':
  Import translations. DO NOT MERGE
 2015-02-23 16:53:23 +00:00
Geoff Mendal
c37feed094 am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '87809139d223ae1e5629590ba7611b9b1da63cbb':
  Import translations. DO NOT MERGE
 2015-02-23 16:47:35 +00:00
Geoff Mendal
87809139d2 am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '4c58f1271d60554375d85598134fdc821563e78a':
  Import translations. DO NOT MERGE
 2015-02-23 16:41:22 +00:00
Geoff Mendal
4c58f1271d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 16:34:42 +00:00
Geoff Mendal
6e241f6438 Merge "Import translations. DO NOT MERGE" 2015-02-23 16:30:08 +00:00
Geoff Mendal
1df5df2b77 Import translations. DO NOT MERGE 
Change-Id: Ia406db95dc51e21b462e9de8451ad221023447fd
Auto-generated-cl: translation import
 2015-02-23 07:47:09 -08:00
Geoff Mendal
12e6a8e83a Import translations. DO NOT MERGE 
Change-Id: I5b1afb50ecf6cb08b2612edeba53c21d7fdf2ed6
Auto-generated-cl: translation import
 2015-02-23 07:41:54 -08:00