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

176125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
0927c43c38 Merge "Remove obsolete AudioManager audio dock plugged Intents" 2014-12-03 13:39:26 +00:00
Adam Lesinski
4fb972207a am 3550c6c5: am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev 
* commit '3550c6c5d67740b8ea77b2921146780fe340f34e':
  AAPT: Add custom transition classes to Proguard keep set
 2014-12-03 00:32:09 +00:00
Jason Sams
7048518eb1 am 233d700e: am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version." 
* commit '233d700efc5f308fe32acc5984b636860e4fc7b0':
  Fix bug in passing of context flags and version.
 2014-12-03 00:31:57 +00:00
Christopher Tate
0749755989 am f83fa5fe: am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit 'f83fa5fee60f449db0591661471581b8ce128439':
  Properly recognize repeating wakeup alarms
 2014-12-03 00:31:52 +00:00
Christopher Tate
3fbb7900b9 am 953e90d0: am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit '953e90d0d77b050020fcdfae5b857108adb92102':
  Midnight should mean midnight
 2014-12-03 00:31:46 +00:00
Alan Viverette
ea0db58af3 am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev 
* commit '42b678b3d7c10d6986aea82ec72e1b36f243972a':
  Update drawable container constant state following clone
 2014-12-03 00:31:39 +00:00
Alan Viverette
f50644f22b am 6c23ba0d: am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 
* commit '6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5':
  Deprecate one-arg getDrawableForDensity, update currents.txt
 2014-12-03 00:31:33 +00:00
Svetoslav
67880ce3ff am 935702b6: am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev 
* commit '935702b6d5873d028c5f5c0e35e46a35b5e11a22':
  Allow more space for the printer spinner to avoid truncation.
 2014-12-03 00:31:23 +00:00
Alan Viverette
1eb35de522 am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '0cd6296c0afb92f63487247ef4c9c73715113926':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-03 00:31:13 +00:00
Ricardo Cervera
58d3ddae33 am 24d40b30: am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne 
* commit '24d40b302e5dabc6c435b6549ef5801540edfca8':
  docs: Long press to dismiss fix by Wayne
 2014-12-03 00:31:07 +00:00
Adam Lesinski
625fa573b4 am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-03 00:30:56 +00:00
Chris Wren
83cb9cad31 am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
  Keep deleteIntent when copying Notification attributes
 2014-12-03 00:30:44 +00:00
Baligh Uddin
2135ce48a1 am 97267def: (-s ours) am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '97267def8219d6ad3d8a96449b08653ae1bd6832':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:35 +00:00
Baligh Uddin
fa2b3c24c7 am 52632ad8: (-s ours) am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '52632ad881c96e785518e18fde1a72e6f6e25a42':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:30 +00:00
Baligh Uddin
12cadd4daf am 3b027a37: (-s ours) am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:26 +00:00
Baligh Uddin
68ccc097e9 am e105a70a: (-s ours) am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
  Import translations. DO NOT MERGE
 2014-12-03 00:30:22 +00:00
Jinsuk Kim
7ef3d12832 am eb6c6d63: am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit 'eb6c6d634774d85eceac135a91fdeaf3a884152e':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-03 00:30:08 +00:00
Alan Viverette
5c39807a57 am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp 
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
  Consider RTL layout in DPAD navigation in AbsSeekBar
 2014-12-03 00:29:46 +00:00
Craig Mautner
7ef0d514c3 am 61a7b7cf: am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit '61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-03 00:29:30 +00:00
Stuart Scott
cacd99bd2c am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-03 00:29:21 +00:00
Nick Kralevich
2ae769782e resolved conflicts for merge of ef9b1643 to master 
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
 2014-12-02 16:22:57 -08: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
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
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
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