Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,036 Commits 3 Branches 0 Tags
d82f08196b32c5182f3181dda08cb4e2d83e6064
Commit Graph

170036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d82f08196b am 42f0a843: (-s ours) am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '42f0a8434636497737dae01db719908cc45910e4':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:26 +00:00
Michael Wright
eb26c8ee2a am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 07:56:20 +00:00
Alan Viverette
4483f4611e am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 07:56:12 +00:00
Dan Sandler
e43bab74bc am 29f89da0: am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 
* commit '29f89da0a8a38dd060c8bd277d7473ccc3843185':
  Turn off DEBUG_GESTURES
 2014-12-03 07:56:07 +00:00
George Mount
a3a53251f1 am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
  Keep snapshot order matching the shared elements.
 2014-12-03 07:56:00 +00:00
Baligh Uddin
42f0a84346 am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fccb3b43a9dfe4dfd3d03119e37b2c99fc95042c':
  Import translations. DO NOT MERGE
 2014-12-03 02:18:24 +00:00
Michael Wright
4de2ab4c55 am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '7081a5d1ae6b9fe5d92dca25a85524c2c2421e1e':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 02:18:19 +00:00
Alan Viverette
bb241c3cde am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 02:18:12 +00:00
Dan Sandler
29f89da0a8 am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 
* commit 'dfb39ce332d4256363d1c2a47e68eecd5f144edc':
  Turn off DEBUG_GESTURES
 2014-12-03 02:18:06 +00:00
George Mount
24fac506f0 am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
  Keep snapshot order matching the shared elements.
 2014-12-03 02:17:58 +00:00
Baligh Uddin
fccb3b43a9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:24:34 +00:00
Michael Wright
7081a5d1ae Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 2014-12-03 01:14:22 +00:00
Alan Viverette
4eb2e04f4d Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 2014-12-03 00:43:47 +00:00
Baligh Uddin
1540fd9cc5 Import translations. DO NOT MERGE 
Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import
 2014-12-02 16:28:12 -08:00
Alan Viverette
9752428dc1 Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting 
Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
 2014-12-02 16:24:24 -08:00
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
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
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