OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into...
Adam Lesinski [Wed, 3 Dec 2014 18:35:52 +0000 (18:35 +0000)]
am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

* commit '91ca64ea291fceb43514b459ba76d13abc80f506':
  AAPT: Add pathMotion custom classes to Proguard Keep set

9 years agoam ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after...
Dianne Hackborn [Wed, 3 Dec 2014 18:35:46 +0000 (18:35 +0000)]
am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
  Work on issue #18572506: AppOps in-memory state is invalid after...

9 years agoMerge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 18:04:22 +0000 (18:04 +0000)]
Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

9 years agoMerge "Work on issue #18572506: AppOps in-memory state is invalid after..." into...
Dianne Hackborn [Wed, 3 Dec 2014 18:03:25 +0000 (18:03 +0000)]
Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

9 years agoWork on issue #18572506: AppOps in-memory state is invalid after...
Dianne Hackborn [Wed, 3 Dec 2014 02:32:20 +0000 (18:32 -0800)]
Work on issue #18572506: AppOps in-memory state is invalid after...

...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9

9 years agoam f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev
Adrian Roos [Wed, 3 Dec 2014 17:19:35 +0000 (17:19 +0000)]
am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev

* commit 'f235edf21532c63f149ad8653a76558fba087f3e':
  Refresh user list a little more eagerly

9 years agoam 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev
Svetoslav [Wed, 3 Dec 2014 17:19:29 +0000 (17:19 +0000)]
am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev

* commit '4667d247bbff30d7fe47a4022b91eb03da17be4d':
  Inconsistent media sizes for es-US locale.

9 years agoam 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev
Jason Monk [Wed, 3 Dec 2014 17:19:24 +0000 (17:19 +0000)]
am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev

* commit '8d72046b9ba06feadbcf71815a1c6e1017c8da37':
  Don't show no sim icon on wifi devices

9 years agoam 195c4388: Fixing bugs in the LLand.
Daniel Sandler [Wed, 3 Dec 2014 17:19:19 +0000 (17:19 +0000)]
am 195c4388: Fixing bugs in the LLand.

* commit '195c438883dfcca799aa456dfe52d24c077e40da':
  Fixing bugs in the LLand.

9 years agoam 3f6755f5: CEC: Check command type for power status monitor action
Jinsuk Kim [Wed, 3 Dec 2014 17:19:14 +0000 (17:19 +0000)]
am 3f6755f5: CEC: Check command type for power status monitor action

* commit '3f6755f58722bbae532171c384a294e530864ae1':
  CEC: Check command type for power status monitor action

9 years agoam dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev
Craig Mautner [Wed, 3 Dec 2014 17:19:01 +0000 (17:19 +0000)]
am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev

* commit 'dad92f3668c8f153b4be946bed32c338c5fb6317':
  Don't process windows belonging to unshown users

9 years agoam dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
Lorenzo Colitti [Wed, 3 Dec 2014 17:18:52 +0000 (17:18 +0000)]
am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev

* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
  Make StatusBar display all default networks.

9 years agoMerge "Refresh user list a little more eagerly" into lmp-mr1-dev
Adrian Roos [Wed, 3 Dec 2014 17:13:53 +0000 (17:13 +0000)]
Merge "Refresh user list a little more eagerly" into lmp-mr1-dev

9 years agoMerge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev
Svetoslav [Wed, 3 Dec 2014 16:33:59 +0000 (16:33 +0000)]
Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev

9 years agoMerge "Don't show no sim icon on wifi devices" into lmp-mr1-dev
Jason Monk [Wed, 3 Dec 2014 14:12:22 +0000 (14:12 +0000)]
Merge "Don't show no sim icon on wifi devices" into lmp-mr1-dev

9 years agoFixing bugs in the LLand.
Daniel Sandler [Mon, 24 Nov 2014 23:54:40 +0000 (18:54 -0500)]
Fixing bugs in the LLand.

      less garish hue on the bugdroid
       :
  +----:-----------+
  | |  : |    Θ.......... improved pop styles
  | |  : @    |    |
  | O  A      |....... occasionally there was no gap to fly
  |      0    O    |   through, creating an unintentional
  | @    |    |    |   commentary on the futility of it all
  +----------------+
     :      :
     :      : animation could continue
     :        after activity pause, sapping
     :        precious cycles
     :
   failure is now more visceral

Bug: 17931806
Change-Id: Iea9bd88e340beb3a0ca310db071ec9f6ec719a33

9 years agoCEC: Check command type for power status monitor action
Jinsuk Kim [Wed, 3 Dec 2014 06:48:17 +0000 (15:48 +0900)]
CEC: Check command type for power status monitor action

The action was not checking the command type before processing.
Makes sure the right command is given for the rest of the action flow.

Bug: 18592547
Change-Id: Iaf2584501fc70bfc87e00b74f48cb11c6989f283

9 years agoMerge "Don't process windows belonging to unshown users" into lmp-mr1-dev
Craig Mautner [Wed, 3 Dec 2014 07:16:34 +0000 (07:16 +0000)]
Merge "Don't process windows belonging to unshown users" into lmp-mr1-dev

9 years agoMerge "Make StatusBar display all default networks." into lmp-mr1-dev
Lorenzo Colitti [Wed, 3 Dec 2014 06:58:06 +0000 (06:58 +0000)]
Merge "Make StatusBar display all default networks." into lmp-mr1-dev

9 years agoam f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions...
Filip Gruszczynski [Wed, 3 Dec 2014 02:59:35 +0000 (02:59 +0000)]
am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev

* commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84':
  Add overscan insets to surface frame dimensions in WallpaperService.

9 years agoam 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperServi...
Filip Gruszczynski [Wed, 3 Dec 2014 02:53:41 +0000 (02:53 +0000)]
am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev

* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
  Add overscan insets to surface frame dimensions in WallpaperService.

9 years agoam b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
Dongwon Kang [Wed, 3 Dec 2014 02:39:19 +0000 (02:39 +0000)]
am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev

* commit 'b0bbaec8bec519e85c33b4a25fa138e8017d6424':
  TIF: call tune() in HardwareSession

9 years agoMerge "Add overscan insets to surface frame dimensions in WallpaperService." into...
Filip Gruszczynski [Wed, 3 Dec 2014 02:23:32 +0000 (02:23 +0000)]
Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev

9 years agoMerge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
Dongwon Kang [Wed, 3 Dec 2014 02:22:09 +0000 (02:22 +0000)]
Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev

9 years agoam b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings...
Sanket Padawe [Wed, 3 Dec 2014 02:19:06 +0000 (02:19 +0000)]
am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev

* commit 'b13c12f58db3026ad30849873b3b6fc664f5ce7b':
  Call entitlement on clicking tethering tile in quick settings.

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 "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:33:42 +0000 (01:33 +0000)]
Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev

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 agoAdd overscan insets to surface frame dimensions in WallpaperService.
Filip Gruszczynski [Wed, 3 Dec 2014 01:18:53 +0000 (17:18 -0800)]
Add overscan insets to surface frame dimensions in WallpaperService.

Bug: 18595832
Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed

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 agoDon't process windows belonging to unshown users
Craig Mautner [Wed, 3 Dec 2014 00:47:29 +0000 (16:47 -0800)]
Don't process windows belonging to unshown users

Add a test for whether a window will be shown to the current user.
Otherwise we wait to process windows that are drawn but will never
be shown. Consequently we end up in a layout loop that continues
to set pendingLayoutChanges at the point where "wallpaper and
commitFinishDrawingLocked true" message is generated.

Fixes bug 18510914.

Change-Id: Ib067b41b5f26b146ee6bdb16c2f3b07d20aa2c54

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 agoAAPT: Add pathMotion custom classes to Proguard Keep set
Adam Lesinski [Wed, 3 Dec 2014 00:19:05 +0000 (16:19 -0800)]
AAPT: Add pathMotion custom classes to Proguard Keep set

Bug:18590044
Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57

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 agoInconsistent media sizes for es-US locale.
Svetoslav [Tue, 2 Dec 2014 22:19:00 +0000 (14:19 -0800)]
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

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