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

176374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
dfb39ce332 Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 2014-12-03 00:22:19 +00:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Adam Lesinski
3550c6c5d6 am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 
* commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6':
  AAPT: Add custom transition classes to Proguard keep set
 2014-12-03 00:05:33 +00:00
Jason Sams
233d700efc am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version." 
* commit 'b940599a750e3ee50934c57b6a22841627be2d2e':
  Fix bug in passing of context flags and version.
 2014-12-03 00:00:21 +00:00
Nancy Chen
ddf15a1649 Change a semi-colon to a colon in AudioState logging. 
I believe "route;" -> "route:" was the intended context.

Bug: 18327621
Change-Id: I5fcd285f58dcd74287937babf3f0a8122dab5d3d
 2014-12-02 15:59:35 -08:00
Adam Lesinski
f17611a29e am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 
* commit '130e30fe247c85aeb777a0f60b31885fef613930':
  AAPT: Add custom transition classes to Proguard keep set
 2014-12-02 23:57:12 +00:00
Christopher Tate
f83fa5fee6 am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit 'f9221a1076203832d8d88a8720c12cad91aee906':
  Properly recognize repeating wakeup alarms
 2014-12-02 23:56:58 +00:00
Christopher Tate
953e90d0d7 am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit 'f246b484c5cf8b63e1b700d17e8161f566e3f5d7':
  Midnight should mean midnight
 2014-12-02 23:56:52 +00:00
Jason Sams
b940599a75 am abdaa32d: Merge "Fix bug in passing of context flags and version." 
* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.
 2014-12-02 23:52:12 +00:00
Adam Lesinski
130e30fe24 Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 2014-12-02 23:50:51 +00:00
Christopher Tate
f9221a1076 am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit '3bec50908b8438c04a654a3bb806f05a01402ce7':
  Properly recognize repeating wakeup alarms
 2014-12-02 23:48:31 +00:00
Christopher Tate
f246b484c5 am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit '99391361217cd9234ddc0570055677863cb6fb34':
  Midnight should mean midnight
 2014-12-02 23:48:26 +00:00
Alan Viverette
42b678b3d7 am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev 
* commit 'fa173e0c65219e56625c22b0ac482354d924bcd8':
  Update drawable container constant state following clone
 2014-12-02 23:45:31 +00:00
Alan Viverette
6c23ba0d8d am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 
* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
  Deprecate one-arg getDrawableForDensity, update currents.txt
 2014-12-02 23:45:25 +00:00
Jason Sams
abdaa32dd7 Merge "Fix bug in passing of context flags and version." 2014-12-02 23:45:17 +00:00
Christopher Tate
3bec50908b Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 2014-12-02 23:44:20 +00:00
Christopher Tate
9939136121 Merge "Midnight should mean midnight" into lmp-mr1-dev 2014-12-02 23:44:00 +00:00
Adam Lesinski
4c488ff931 AAPT: Add custom transition classes to Proguard keep set 
Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c
 2014-12-02 15:40:17 -08:00
Alan Viverette
fa173e0c65 am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev 
* commit 'd72901f0d47d2339d8cedb6af0b4d8c58b3178ae':
  Update drawable container constant state following clone
 2014-12-02 23:37:55 +00:00
Alan Viverette
a6779bc517 am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 
* commit '9a888816de21c4e146acbd608fdea110a299f42d':
  Deprecate one-arg getDrawableForDensity, update currents.txt
 2014-12-02 23:37:47 +00:00
Winson Chung
740c3ac782 Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345) 
Add a listener to listen for changes in the Task stacks to preload thumbnails from the
system.  In addition, reduce the amount of synchronous work done in activity creation
and first measure/layout passes.

Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
 2014-12-02 15:34:20 -08:00
Alan Viverette
d72901f0d4 Merge "Update drawable container constant state following clone" into lmp-mr1-dev 2014-12-02 23:31:10 +00:00
Alan Viverette
9a888816de Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 2014-12-02 23:30:54 +00:00
Svetoslav
935702b6d5 am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev 
* commit '95482c28f5b6fba7427770212374c3c8d22b280e':
  Allow more space for the printer spinner to avoid truncation.
 2014-12-02 23:30:21 +00:00
Alan Viverette
a6f8b2ce55 Deprecate one-arg getDrawableForDensity, update currents.txt 
BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
 2014-12-02 15:26:33 -08:00
Svetoslav
95482c28f5 am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev 
* commit 'cdd3356da9386bff842d9a29fad09a1d5edc1e73':
  Allow more space for the printer spinner to avoid truncation.
 2014-12-02 23:23:40 +00:00
Alan Viverette
0cd6296c0a am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-02 23:19:28 +00:00
Ricardo Cervera
24d40b302e am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit 'ce9936a85e6b73b47e0c9a6b4c3495dffae4a079':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 23:19:23 +00:00
Svetoslav
cdd3356da9 Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev 2014-12-02 23:16:38 +00:00
Alan Viverette
63c7a655be am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-02 23:11:36 +00:00
Ricardo Cervera
ce9936a85e am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '152470a29212479c8ccc9e2c1a9f26188a5b7411':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 23:11:30 +00:00
Svetoslav
a1ec54b454 Inconsistent media sizes for es-US locale. 
The pdf_printer_media_sizes array for es-US was missing
resulting in using European paper sizes for US locale and
as a result no default media size for this locale. This
resulted in printing not working for es-US.

bug:18536264

Change-Id: Ied552a63d628be38dc5249f3cd6107cbeaa692a8
 2014-12-02 15:09:59 -08:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Alan Viverette
1b33396ee4 Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 2014-12-02 23:07:03 +00:00
Ricardo Cervera
152470a292 am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '8c71df8dd89c68128e709eab60da8105772d6194':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 23:05:07 +00:00
Adam Lesinski
e580d6617f am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:00:06 +00:00
Alan Viverette
c10e3960d9 Deprecate Resources.getDrawable(int) in favor of the two-arg version 
This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
 2014-12-02 14:58:08 -08:00
Ricardo Cervera
8c71df8dd8 am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 22:56:38 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Ricardo Cervera
f9b8bd5e73 am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
  docs: Long press to dismiss fix by Wayne
 2014-12-02 22:50:48 +00:00
Chris Wren
723bce8a0d am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:45:22 +00:00
Chris Wren
47a5cb122a am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:38:28 +00:00
George Mount
92692c0284 Keep snapshot order matching the shared elements. 
Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
 2014-12-02 14:31:31 -08:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Baligh Uddin
97267def82 am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e3a160169bc26bcac35d1759423ab4e98a18d063':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:22 +00:00
Baligh Uddin
52632ad881 am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '747249454ed12b4def32f82c461d5590bec2f2f8':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:16 +00:00
Baligh Uddin
3b027a374e am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3bcc97e7a1eab012d55fa85fa352a95f7c26f547':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:11 +00:00
Baligh Uddin
e105a70ae1 am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '261db4f3a8709a0773d0932dd1052f526e59da3c':
  Import translations. DO NOT MERGE
 2014-12-02 22:27:06 +00:00
Baligh Uddin
e3a160169b am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
  Import translations. DO NOT MERGE
 2014-12-02 22:20:03 +00:00
Baligh Uddin
747249454e am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
  Import translations. DO NOT MERGE
 2014-12-02 22:19:58 +00:00