OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
Jason Sams [Wed, 3 Dec 2014 02:19:00 +0000 (02:19 +0000)]
am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev

* commit 'd6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341':
  Fix bug in passing of context flags and version.

9 years agoam 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:55 +0000 (02:18 +0000)]
am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '0fcd3f41079880abccf08c498b5e109dccfc4577':
  Import translations. DO NOT MERGE

9 years agoam 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:50 +0000 (02:18 +0000)]
am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '925c27bef875f20f4b34254c588296f10fc5fe5a':
  Import translations. DO NOT MERGE

9 years agoam 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:45 +0000 (02:18 +0000)]
am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '91426aa292455aef968e112c2255dd676f7f1ec6':
  Import translations. DO NOT MERGE

9 years agoam ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:40 +0000 (02:18 +0000)]
am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'ed3383770e77b88ab0692bee9acef8d78b2cc7a2':
  Import translations. DO NOT MERGE

9 years agoam 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:35 +0000 (02:18 +0000)]
am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '51bca143862c568507206adf119c9003a4f3f764':
  Import translations. DO NOT MERGE

9 years agoam d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:30 +0000 (02:18 +0000)]
am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'd33f84eb3e20b781e433d93165d9ff83434d5c99':
  Import translations. DO NOT MERGE

9 years agoam fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:18:24 +0000 (02:18 +0000)]
am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccb3b43a9dfe4dfd3d03119e37b2c99fc95042c':
  Import translations. DO NOT MERGE

9 years agoam 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp...
Michael Wright [Wed, 3 Dec 2014 02:18:19 +0000 (02:18 +0000)]
am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev

* commit '7081a5d1ae6b9fe5d92dca25a85524c2c2421e1e':
  Correctly iterate through MediaProjection callbacks.

9 years agoam 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into...
Alan Viverette [Wed, 3 Dec 2014 02:18:12 +0000 (02:18 +0000)]
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

9 years agoam dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
Dan Sandler [Wed, 3 Dec 2014 02:18:06 +0000 (02:18 +0000)]
am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev

* commit 'dfb39ce332d4256363d1c2a47e68eecd5f144edc':
  Turn off DEBUG_GESTURES

9 years agoam 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
George Mount [Wed, 3 Dec 2014 02:17:58 +0000 (02:17 +0000)]
am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
  Keep snapshot order matching the shared elements.

9 years agoMerge "Fix bug in passing of context flags and version." into lmp-mr1-dev
Jason Sams [Wed, 3 Dec 2014 01:27:36 +0000 (01:27 +0000)]
Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:26:08 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:53 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:26 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:10 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:48 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:38 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:32 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoFix bug in passing of context flags and version.
Jason Sams [Wed, 3 Dec 2014 01:24:17 +0000 (17:24 -0800)]
Fix bug in passing of context flags and version.

bug 18592099

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7

9 years agoMerge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 01:14:20 +0000 (01:14 +0000)]
Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:50:24 +0000 (16:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia2ccce90103cdc5e6b3814d50394e9c81e38010d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:47:06 +0000 (16:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:45:14 +0000 (16:45 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id585c5bed5366430b476445a1806748894dd34ac
Auto-generated-cl: translation import

9 years agoMerge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
Alan Viverette [Wed, 3 Dec 2014 00:43:46 +0000 (00:43 +0000)]
Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:37:24 +0000 (16:37 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7224417957b74eabb5e828d94ad11d89738f1724
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:32:15 +0000 (16:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6d028c94d3ac7df54925008e3cd71973aa9254c9
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:30:05 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: I91311501af2edb114e6db77786fcefaa6d26db3a
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:28:12 +0000 (16:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import

9 years agoUse CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
Alan Viverette [Wed, 3 Dec 2014 00:24:24 +0000 (16:24 -0800)]
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2

9 years agoMerge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
Dan Sandler [Wed, 3 Dec 2014 00:22:17 +0000 (00:22 +0000)]
Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev

9 years agoMerge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
George Mount [Wed, 3 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

9 years agoam 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into...
Adam Lesinski [Tue, 2 Dec 2014 23:57:12 +0000 (23:57 +0000)]
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

9 years agoMerge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
Adam Lesinski [Tue, 2 Dec 2014 23:50:49 +0000 (23:50 +0000)]
Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

9 years agoam 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 23:48:31 +0000 (23:48 +0000)]
am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

* commit '3bec50908b8438c04a654a3bb806f05a01402ce7':
  Properly recognize repeating wakeup alarms

9 years agoam 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 23:48:26 +0000 (23:48 +0000)]
am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev

* commit '99391361217cd9234ddc0570055677863cb6fb34':
  Midnight should mean midnight

9 years agoMerge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 23:44:18 +0000 (23:44 +0000)]
Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

9 years agoMerge "Midnight should mean midnight" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 23:43:58 +0000 (23:43 +0000)]
Merge "Midnight should mean midnight" into lmp-mr1-dev

9 years agoAAPT: Add custom transition classes to Proguard keep set
Adam Lesinski [Tue, 2 Dec 2014 22:50:21 +0000 (14:50 -0800)]
AAPT: Add custom transition classes to Proguard keep set

Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c

9 years agoam d72901f0: Merge "Update drawable container constant state following clone" into...
Alan Viverette [Tue, 2 Dec 2014 23:37:55 +0000 (23:37 +0000)]
am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev

* commit 'd72901f0d47d2339d8cedb6af0b4d8c58b3178ae':
  Update drawable container constant state following clone

9 years agoam 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt...
Alan Viverette [Tue, 2 Dec 2014 23:37:47 +0000 (23:37 +0000)]
am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit '9a888816de21c4e146acbd608fdea110a299f42d':
  Deprecate one-arg getDrawableForDensity, update currents.txt

9 years agoMerge "Update drawable container constant state following clone" into lmp-mr1-dev
Alan Viverette [Tue, 2 Dec 2014 23:31:08 +0000 (23:31 +0000)]
Merge "Update drawable container constant state following clone" into lmp-mr1-dev

9 years agoMerge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
Alan Viverette [Tue, 2 Dec 2014 23:30:52 +0000 (23:30 +0000)]
Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

9 years agoDeprecate one-arg getDrawableForDensity, update currents.txt
Alan Viverette [Tue, 2 Dec 2014 23:26:33 +0000 (15:26 -0800)]
Deprecate one-arg getDrawableForDensity, update currents.txt

BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff

9 years agoam cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation...
Svetoslav [Tue, 2 Dec 2014 23:23:40 +0000 (23:23 +0000)]
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.

9 years agoMerge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev
Svetoslav [Tue, 2 Dec 2014 23:16:36 +0000 (23:16 +0000)]
Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

9 years agoam 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg...
Alan Viverette [Tue, 2 Dec 2014 23:11:36 +0000 (23:11 +0000)]
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

9 years agoam 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix...
Ricardo Cervera [Tue, 2 Dec 2014 23:11:30 +0000 (23:11 +0000)]
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

9 years agoMerge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into...
Alan Viverette [Tue, 2 Dec 2014 23:07:01 +0000 (23:07 +0000)]
Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

9 years agoam 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne
Ricardo Cervera [Tue, 2 Dec 2014 23:05:07 +0000 (23:05 +0000)]
am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '8c71df8dd89c68128e709eab60da8105772d6194':
  docs: Long press to dismiss fix by Wayne

9 years agoDeprecate Resources.getDrawable(int) in favor of the two-arg version
Alan Viverette [Tue, 2 Dec 2014 22:58:08 +0000 (14:58 -0800)]
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

9 years agoam f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne
Ricardo Cervera [Tue, 2 Dec 2014 22:56:38 +0000 (22:56 +0000)]
am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
  docs: Long press to dismiss fix by Wayne

9 years agoam 6ee2ca2f: docs: Long press to dismiss fix by Wayne
Ricardo Cervera [Tue, 2 Dec 2014 22:50:48 +0000 (22:50 +0000)]
am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
  docs: Long press to dismiss fix by Wayne

9 years agoKeep snapshot order matching the shared elements.
George Mount [Tue, 2 Dec 2014 00:44:05 +0000 (16:44 -0800)]
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

9 years agoam 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:20:03 +0000 (22:20 +0000)]
am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
  Import translations. DO NOT MERGE

9 years agoam fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:19:58 +0000 (22:19 +0000)]
am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
  Import translations. DO NOT MERGE

9 years agoam 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:19:53 +0000 (22:19 +0000)]
am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
  Import translations. DO NOT MERGE

9 years agoam 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:19:48 +0000 (22:19 +0000)]
am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '30460ae37e2d4f8ffda646af471b7039b519d65a':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:16:24 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:14:50 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:14:48 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 2 Dec 2014 22:14:46 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Dec 2014 22:14:05 +0000 (14:14 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import

9 years agoTurn off DEBUG_GESTURES
Christoph Studer [Tue, 25 Nov 2014 11:53:55 +0000 (12:53 +0100)]
Turn off DEBUG_GESTURES

Stop spamming the logs.

Bug: 18584495
Change-Id: Icc7337005a0efc0590b502e93c459f05f0a9ace9

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Dec 2014 22:09:14 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE

Change-Id: I59cdaeb46767c757f817f3e15b7794e7773aa41d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Dec 2014 22:07:25 +0000 (14:07 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1fa46bb80033e1eee5de30cbf0d0d5d07ae4147c
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Dec 2014 22:04:01 +0000 (14:04 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import

9 years agoam fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right"...
Jinsuk Kim [Tue, 2 Dec 2014 21:58:18 +0000 (21:58 +0000)]
am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
  CEC: Set the parameter of <System Audio Mode Request> right

9 years agoMerge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev
Jinsuk Kim [Tue, 2 Dec 2014 21:50:42 +0000 (21:50 +0000)]
Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

9 years agoAllow more space for the printer spinner to avoid truncation.
Svetoslav [Tue, 2 Dec 2014 21:46:23 +0000 (13:46 -0800)]
Allow more space for the printer spinner to avoid truncation.

The save to PDF option is truncated in Russian. While the printer
name can be arbitrarily long, the Save to PDF printer should not
be truncated.

bug:18546218

Change-Id: Id35bd638c505783a2288c1602960e8d74ec3b882

9 years agoam 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp...
Craig Mautner [Tue, 2 Dec 2014 21:20:17 +0000 (21:20 +0000)]
am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

9 years agoMerge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
Craig Mautner [Tue, 2 Dec 2014 21:13:58 +0000 (21:13 +0000)]
Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

9 years agoam 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM...
Stuart Scott [Tue, 2 Dec 2014 21:11:48 +0000 (21:11 +0000)]
am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit '4e779ecd56faad5901854e030f593c5d4ad3dee8':
  Subscription Info density-dependent text size and localized SIM slot index

9 years agodocs: Long press to dismiss fix by Wayne
Ricardo Cervera [Tue, 2 Dec 2014 21:08:10 +0000 (13:08 -0800)]
docs: Long press to dismiss fix by Wayne

Bug: 17924105

Change-Id: Ifbc26b923771e7389e4df6abe9005bc3f0269c1e

9 years agoMerge "Subscription Info density-dependent text size and localized SIM slot index...
Stuart Scott [Tue, 2 Dec 2014 21:04:53 +0000 (21:04 +0000)]
Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

9 years agoDismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
Craig Mautner [Tue, 2 Dec 2014 20:25:14 +0000 (12:25 -0800)]
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.

Fixes bug 18563298.

Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02

9 years agoam 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
Paul Lawrence [Tue, 2 Dec 2014 20:22:18 +0000 (20:22 +0000)]
am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"

9 years agoMerge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
Paul Lawrence [Tue, 2 Dec 2014 20:17:32 +0000 (20:17 +0000)]
Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* changes:
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"

9 years agoam affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom...
Ricardo Cervera [Tue, 2 Dec 2014 19:49:54 +0000 (19:49 +0000)]
am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'affe473213deb4b2d1b9354cc57e2f517840e21a':
  docs: Layout fixes for the Custom UI on Wear class

9 years agoProperly recognize repeating wakeup alarms
Christopher Tate [Tue, 2 Dec 2014 19:48:53 +0000 (11:48 -0800)]
Properly recognize repeating wakeup alarms

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427

9 years agoam dad13577: Merge "Update dark mode on notifications when content is updated" into...
Jorim Jaggi [Tue, 2 Dec 2014 19:41:43 +0000 (19:41 +0000)]
am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
  Update dark mode on notifications when content is updated

9 years agoam aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear...
Ricardo Cervera [Tue, 2 Dec 2014 19:41:30 +0000 (19:41 +0000)]
am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
  docs: Layout fixes for the Custom UI on Wear class

9 years agoMerge "Update dark mode on notifications when content is updated" into lmp-mr1-dev
Jorim Jaggi [Tue, 2 Dec 2014 19:35:39 +0000 (19:35 +0000)]
Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

9 years agoam 221b545c: Merge "Fix issue #18510117: Returning from an activity started with...
Dianne Hackborn [Tue, 2 Dec 2014 19:33:28 +0000 (19:33 +0000)]
am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

* commit '221b545cdaba2522fbb299428ac048641410c284':
  Fix issue #18510117: Returning from an activity started with...

9 years agoam d537987b: Changing AUDIO_TURNED_ON constant.
Kweku Adams [Tue, 2 Dec 2014 19:33:23 +0000 (19:33 +0000)]
am d537987b: Changing AUDIO_TURNED_ON constant.

* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
  Changing AUDIO_TURNED_ON constant.

9 years agoam a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class
Ricardo Cervera [Tue, 2 Dec 2014 19:32:49 +0000 (19:32 +0000)]
am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
  docs: Layout fixes for the Custom UI on Wear class

9 years agoMerge "Fix issue #18510117: Returning from an activity started with..." into lmp...
Dianne Hackborn [Tue, 2 Dec 2014 19:22:06 +0000 (19:22 +0000)]
Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

9 years agoChanging AUDIO_TURNED_ON constant.
Kweku Adams [Tue, 25 Nov 2014 01:34:05 +0000 (17:34 -0800)]
Changing AUDIO_TURNED_ON constant.

Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a

9 years agoam 64f49162: docs: Layout fixes for the Custom UI on Wear class
Ricardo Cervera [Tue, 2 Dec 2014 19:13:54 +0000 (19:13 +0000)]
am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
  docs: Layout fixes for the Custom UI on Wear class

9 years agoam fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes...
Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:12:24 +0000 (19:12 +0000)]
am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'fcae79f65d60069f75c4db92a68d56c9eb8b5213':
  Sensor documentation fixes.

9 years agodocs: Layout fixes for the Custom UI on Wear class
Ricardo Cervera [Tue, 2 Dec 2014 19:05:22 +0000 (11:05 -0800)]
docs: Layout fixes for the Custom UI on Wear class

Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0

9 years agoam d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp...
Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:01:22 +0000 (19:01 +0000)]
am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'd5412e35801243e14123f2a0f03759073eb20fb6':
  Sensor documentation fixes.

9 years agoam 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
Andrew Lee [Tue, 2 Dec 2014 18:59:32 +0000 (18:59 +0000)]
am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

* commit '4ef369fce92d0e140189f305783855d8ae27067d':
  Rename VoLTE capability to HD audio.

9 years agoam 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp...
Christoph Studer [Tue, 2 Dec 2014 18:59:26 +0000 (18:59 +0000)]
am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev

* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
  NoMan/SysUI: Clear LEDs only when entering the shade

9 years agoMidnight should mean midnight
Christopher Tate [Tue, 2 Dec 2014 18:55:09 +0000 (10:55 -0800)]
Midnight should mean midnight

...not noon-or-midnight.  Fix the initial fstrim delay to properly refer
to midnight rather than ambiguous 12-hour "zero" so that fstrim job
consideration always starts overnight rather than possibly at the following
day's noon, depending on when the device was booted.

Bug 18076397

Change-Id: Ife3cd5bdeb14c7832b6e2a2de88dcfd1ba731b67

9 years agoam 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs
Ricardo Cervera-Navarro [Tue, 2 Dec 2014 18:53:20 +0000 (18:53 +0000)]
am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
  Sensor documentation fixes.

9 years agoMerge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
Andrew Lee [Tue, 2 Dec 2014 18:50:59 +0000 (18:50 +0000)]
Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

9 years agoam eaaf0512: Crash in print spooler when back pressed before content update complted.
Svet Ganov [Tue, 2 Dec 2014 18:50:41 +0000 (18:50 +0000)]
am eaaf0512: Crash in print spooler when back pressed before content update complted.

* commit 'eaaf0512fcbf03b926cdbbbb7f54df474ecf861a':
  Crash in print spooler when back pressed before content update complted.

9 years agoMerge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
Christoph Studer [Tue, 2 Dec 2014 18:49:49 +0000 (18:49 +0000)]
Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev