OSDN Git Service

android-x86/frameworks-base.git
9 years agoam abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong...
Keisuke Kuroyanagi [Tue, 21 Jul 2015 00:14:50 +0000 (00:14 +0000)]
am abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit 'abe22377262a2aadbeb3b64d8bc10916b0256d6d':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam d1e755a8: am 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optio...
Robert Greenwalt [Tue, 21 Jul 2015 00:14:43 +0000 (00:14 +0000)]
am d1e755a8: am 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'd1e755a87b616e9acd46018d9d9964333062c702':
  Support optional modem restart on certain errors.

9 years agoam 3bb80cd1: am 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot...
Jason Monk [Tue, 21 Jul 2015 00:14:28 +0000 (00:14 +0000)]
am 3bb80cd1: am 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '3bb80cd19569eb31021eb975091a0d776998e25b':
  Fix hotspot brokenness

9 years agoam d12974f3: am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession...
Jae Seo [Tue, 21 Jul 2015 00:14:21 +0000 (00:14 +0000)]
am d12974f3: am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'd12974f336bee5f3d1a14b51f0d6ded4af8afd64':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI...
Jeff Sharkey [Tue, 21 Jul 2015 00:14:13 +0000 (00:14 +0000)]
am d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'd4dc87569fcc608f8065395c98ac956a3d11a79a':
  Inherit ABI when moving existing install.

9 years agoam 6f5bf717: am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap...
Roozbeh Pournader [Tue, 21 Jul 2015 00:13:59 +0000 (00:13 +0000)]
am 6f5bf717: am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '6f5bf7170281b29ef1080fb02328715e08e19d8d':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 385f2d18: (-s ours) am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d...
Geoff Mendal [Tue, 21 Jul 2015 00:13:45 +0000 (00:13 +0000)]
am 385f2d18: (-s ours) am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '385f2d18c631190fc9eb0ea14b288f5589a1f30c':
  Import translations. DO NOT MERGE

9 years agoMerge commit '01fda527'
Qiwen Zhao [Mon, 20 Jul 2015 22:52:23 +0000 (15:52 -0700)]
Merge commit '01fda527'

Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 20 Jul 2015 22:14:59 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 22:10:09 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE

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

9 years agoFix accessibility labels for app shelf
James Cook [Mon, 20 Jul 2015 16:08:15 +0000 (09:08 -0700)]
Fix accessibility labels for app shelf

* Label the pinned and recent buttons with human-readable names.
* Set the divider line to non-focusable so it doesn't participate
  in accessibility.

Bug: 22568004
Change-Id: I298a927325fb23c357ed035e71013ef4f6965607

9 years agoam 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion...
Keisuke Kuroyanagi [Mon, 20 Jul 2015 22:08:12 +0000 (22:08 +0000)]
am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '7423ca03a3d3e7d65549750bf46d744c6122df4f':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem...
Robert Greenwalt [Mon, 20 Jul 2015 22:08:02 +0000 (22:08 +0000)]
am 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '420d5fddc078b44e7f817984d1e5aaf7e8514823':
  Support optional modem restart on certain errors.

9 years agoam d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position...
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:56:24 +0000 (21:56 +0000)]
am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit 'd49c3b65311aad1f70ed9194d46a4bca302fe89e':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certa...
Robert Greenwalt [Mon, 20 Jul 2015 21:56:17 +0000 (21:56 +0000)]
am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '30cf80792165d88e9844b5867e9f598f2f64f0df':
  Support optional modem restart on certain errors.

9 years agoam 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness...
Jason Monk [Mon, 20 Jul 2015 21:46:32 +0000 (21:46 +0000)]
am 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '85670df03c2ea3f561fa27bd11fd6bdf43b38b0b':
  Fix hotspot brokenness

9 years agoam a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock...
Jae Seo [Mon, 20 Jul 2015 21:46:26 +0000 (21:46 +0000)]
am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'a38aaba22208af66deb387dc7c21e0308065fbec':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving...
Jeff Sharkey [Mon, 20 Jul 2015 21:46:18 +0000 (21:46 +0000)]
am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit '4524184c07f25548cd4cd94713b529ed73d419ac':
  Inherit ABI when moving existing install.

9 years agoam 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract...
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:38:29 +0000 (21:38 +0000)]
am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '00eb57678d8e6aa152ffbbf4b43f41c3287e480e':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors...
Robert Greenwalt [Mon, 20 Jul 2015 21:38:23 +0000 (21:38 +0000)]
am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'dacf0443d57c11c8b7021f591a20519e53dd3b9e':
  Support optional modem restart on certain errors.

9 years agoam eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 21:32:27 +0000 (21:32 +0000)]
am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit 'eeeb45a76d477c4c1f8590775de83e30a67501d9':
  Fix hotspot brokenness

9 years agoam c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManag...
Jae Seo [Mon, 20 Jul 2015 21:32:21 +0000 (21:32 +0000)]
am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'c160c231ab2945a194cd7dbad31837ee49904234':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing instal...
Jeff Sharkey [Mon, 20 Jul 2015 21:32:15 +0000 (21:32 +0000)]
am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'f811d7fc0ff03a9fa70fb46525342127c7435ef5':
  Inherit ABI when moving existing install.

9 years agoam e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results...
Roozbeh Pournader [Mon, 20 Jul 2015 21:32:00 +0000 (21:32 +0000)]
am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit 'e5b23381113b22feddb8d8339698bfdb1cf1656c':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:23:43 +0000 (21:23 +0000)]
am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '437eb6ce483a34e28c06d70c0b408ba4a495293a':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev
Robert Greenwalt [Mon, 20 Jul 2015 21:23:38 +0000 (21:23 +0000)]
am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'b0e4a9e8a4367cbc3c7f08f7f95cfa0c9397fdaf':
  Support optional modem restart on certain errors.

9 years agoam e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short...
Roozbeh Pournader [Mon, 20 Jul 2015 21:18:32 +0000 (21:18 +0000)]
am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit 'e043a74bd0598ba2abb68d94d6d8a1f7ea5a2ccb':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 21:17:37 +0000 (21:17 +0000)]
am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '47b9d250220f7eaaef7465367fd6ff0d2c86f4e1':
  Fix hotspot brokenness

9 years agoam 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamV...
Jae Seo [Mon, 20 Jul 2015 21:17:32 +0000 (21:17 +0000)]
am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit '48d707ae07df8b03585fc00880e61ebf7cdb6a5b':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into...
Jeff Sharkey [Mon, 20 Jul 2015 21:17:28 +0000 (21:17 +0000)]
am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'fe7a311c421473f1b50dcd2751585f89664a4327':
  Inherit ABI when moving existing install.

9 years agoMerge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
Keisuke Kuroyanagi [Mon, 20 Jul 2015 21:12:36 +0000 (21:12 +0000)]
Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

9 years agoMerge "Support optional modem restart on certain errors." into mnc-dev
Robert Greenwalt [Mon, 20 Jul 2015 21:10:39 +0000 (21:10 +0000)]
Merge "Support optional modem restart on certain errors." into mnc-dev

9 years agoam 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize(...
Roozbeh Pournader [Mon, 20 Jul 2015 20:56:57 +0000 (20:56 +0000)]
am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '91bb9d0a8489068c88d9d2496d9e806cf4094df3':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam c7a024a1: (-s ours) am d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a...
Geoff Mendal [Mon, 20 Jul 2015 20:55:35 +0000 (20:55 +0000)]
am c7a024a1: (-s ours) am d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 03dbf19a: am 88d51c3c: am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue...
Wale Ogunwale [Mon, 20 Jul 2015 20:55:27 +0000 (20:55 +0000)]
am 03dbf19a: am 88d51c3c: am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '03dbf19a119caac06fd15cc7e3023a55f9ac06d8':
  Fixed issue with background user window consuming touch events

9 years agoam 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:55:19 +0000 (20:55 +0000)]
am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '33c619bb52c9e3e62b7243c9b1d9a75189885427':
  Fix hotspot brokenness

9 years agoam 3f655b83: am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiM...
Ricardo Garcia [Mon, 20 Jul 2015 20:55:19 +0000 (20:55 +0000)]
am 3f655b83: am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '3f655b83d3a02779aeaa5e9e7921338889f60ce5':
  Fix for MidiManager bug

9 years agoam 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into...
Jae Seo [Mon, 20 Jul 2015 20:55:14 +0000 (20:55 +0000)]
am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit '26f7720ed0d6a0894772d82b7ebed03ac686c6f3':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam 1ab5d397: am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083...
Billy Lau [Mon, 20 Jul 2015 20:55:11 +0000 (20:55 +0000)]
am 1ab5d397: am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit '1ab5d39764f2b8ab238bcb1b570b788e86c8067b':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:55:09 +0000 (20:55 +0000)]
am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit '35ba2cdbf8654d708e57d209131dd498705d0e18':
  Inherit ABI when moving existing install.

9 years agoam c591b0c4: am 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better loggin...
Jeff Sharkey [Mon, 20 Jul 2015 20:55:04 +0000 (20:55 +0000)]
am c591b0c4: am 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit 'c591b0c454c3aed623a8b7ef620b03c98cc3ac81':
  Better logging of MediaPlayer failure reason.

9 years agoam 10042f91: am 498985e0: am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button...
Jean-Michel Trivi [Mon, 20 Jul 2015 20:54:55 +0000 (20:54 +0000)]
am 10042f91: am 498985e0: am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '10042f910dc1e4b1847c264a5f6b6b3656bf5bc9':
  Media button intent should be send to current user only.

9 years agoam 745f3803: am eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall...
Christopher Tate [Mon, 20 Jul 2015 20:54:46 +0000 (20:54 +0000)]
am 745f3803: am eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '745f380307c8ecf962488447e81745103d5a8682':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoMerge "Fix hotspot brokenness" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:47:15 +0000 (20:47 +0000)]
Merge "Fix hotspot brokenness" into mnc-dev

9 years agoMerge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
Jae Seo [Mon, 20 Jul 2015 20:45:07 +0000 (20:45 +0000)]
Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

9 years agoMerge "Inherit ABI when moving existing install." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 20:44:53 +0000 (20:44 +0000)]
Merge "Inherit ABI when moving existing install." into mnc-dev

9 years agoam 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d...
Geoff Mendal [Mon, 20 Jul 2015 20:42:40 +0000 (20:42 +0000)]
am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6b12a5fea1e8799496f61bf02f927839038b3f33':
  Import translations. DO NOT MERGE

9 years agoam ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assis...
Dianne Hackborn [Mon, 20 Jul 2015 20:42:32 +0000 (20:42 +0000)]
am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoam d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translati...
Geoff Mendal [Mon, 20 Jul 2015 20:42:26 +0000 (20:42 +0000)]
am d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 88d51c3c: am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with backgroun...
Wale Ogunwale [Mon, 20 Jul 2015 20:42:20 +0000 (20:42 +0000)]
am 88d51c3c: am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '88d51c3c07dc5ea80e1cb5253446c53aa59e3749':
  Fixed issue with background user window consuming touch events

9 years agoam c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug...
Ricardo Garcia [Mon, 20 Jul 2015 20:42:12 +0000 (20:42 +0000)]
am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit 'c42940c96a4419528310f6dfc23444de385b4cb2':
  Fix for MidiManager bug

9 years agoInherit ABI when moving existing install.
Jeff Sharkey [Mon, 20 Jul 2015 20:40:18 +0000 (13:40 -0700)]
Inherit ABI when moving existing install.

Previously installed apps are moved between volumes as an complete
package, including any previously unpacked native libraries.  This
means we need to inherit any previously derived ABI when moving.

Bug: 22093837
Change-Id: I7656e338affa44e7f997fe4aa95bb297c0acc165

9 years agoam 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
Roozbeh Pournader [Mon, 20 Jul 2015 20:40:10 +0000 (20:40 +0000)]
am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoFix dragging between icons in the app shelf
James Cook [Mon, 20 Jul 2015 19:31:40 +0000 (12:31 -0700)]
Fix dragging between icons in the app shelf

Convert the icon margin into internal padding. This ensures
that DRAG_ENTERED events are created when the icon is visually
dragged between the icons.

Also change the drag shadow size computation to force it to be
square, because the icon ImageView is no longer square.

Bug: 22603558
Change-Id: I469df043448e562269b764245135fbf898f004ea

9 years agoMerge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
Roozbeh Pournader [Mon, 20 Jul 2015 20:30:37 +0000 (20:30 +0000)]
Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

9 years agoam 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import...
Geoff Mendal [Mon, 20 Jul 2015 20:29:32 +0000 (20:29 +0000)]
am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5038b92e6adae454feb6095092bdaff80ecf1db3':
  Import translations. DO NOT MERGE

9 years agoam 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should...
Dianne Hackborn [Mon, 20 Jul 2015 20:29:26 +0000 (20:29 +0000)]
am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '5cdc7f045f8714f5a9fd00402de5b12d84bba99d':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoam 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 20:29:20 +0000 (20:29 +0000)]
am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

* commit '44c44a2b6ae1d9b7088d0846f6ae49dc61ebb0ea':
  Import translations. DO NOT MERGE

9 years agoam 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window...
Wale Ogunwale [Mon, 20 Jul 2015 20:29:13 +0000 (20:29 +0000)]
am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '7e640edeb3c501ee851e70aa633aa531a6f0b34d':
  Fixed issue with background user window consuming touch events

9 years agoam f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 20:29:07 +0000 (20:29 +0000)]
am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit 'f2fd5002627cd92d5e10d2fd6496c80e8864edb3':
  Fix for MidiManager bug

9 years agoam ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 20 Jul 2015 20:12:55 +0000 (20:12 +0000)]
am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare...
Dianne Hackborn [Mon, 20 Jul 2015 20:12:48 +0000 (20:12 +0000)]
am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '3aefa438300b116d2c080de434e0a890bf1dded5':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoam ca49ae5a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 20:12:43 +0000 (20:12 +0000)]
am ca49ae5a: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming...
Wale Ogunwale [Mon, 20 Jul 2015 20:12:38 +0000 (20:12 +0000)]
am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '81696d13360a00dd3a450e7ff97329e8560c4684':
  Fixed issue with background user window consuming touch events

9 years agoam a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 20:02:37 +0000 (20:02 +0000)]
am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disab...
Dianne Hackborn [Mon, 20 Jul 2015 20:02:32 +0000 (20:02 +0000)]
am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 20 Jul 2015 19:58:35 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 19:53:55 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Fix issue #22531747: Assist info should declare if user has disabled..." into...
Dianne Hackborn [Mon, 20 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

9 years agoFix issue #22531747: Assist info should declare if user has disabled...
Dianne Hackborn [Sat, 18 Jul 2015 01:04:14 +0000 (18:04 -0700)]
Fix issue #22531747: Assist info should declare if user has disabled...

...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b

9 years agoam 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document...
Billy Lau [Mon, 20 Jul 2015 19:26:13 +0000 (19:26 +0000)]
am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit '68a2b6552af226cbc014273bdef6ce353ebf348a':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPla...
Jeff Sharkey [Mon, 20 Jul 2015 19:26:07 +0000 (19:26 +0000)]
am 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '37a8e0e0ae3b920a1b272eaa0fa24fc4c7340288':
  Better logging of MediaPlayer failure reason.

9 years agoam 498985e0: am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should...
Jean-Michel Trivi [Mon, 20 Jul 2015 19:26:00 +0000 (19:26 +0000)]
am 498985e0: am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '498985e05f7e85bba1c7a1e889dec590b6bb6b6a':
  Media button intent should be send to current user only.

9 years agoam e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can...
Billy Lau [Mon, 20 Jul 2015 19:11:22 +0000 (19:11 +0000)]
am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit 'e4bcf4803b41cf7e370d5f1d0c7ef1edf48ea267':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure...
Jeff Sharkey [Mon, 20 Jul 2015 19:11:17 +0000 (19:11 +0000)]
am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit 'f14e4435e02c1cf058d475a389abae3000562190':
  Better logging of MediaPlayer failure reason.

9 years agoam 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send...
Jean-Michel Trivi [Mon, 20 Jul 2015 19:11:10 +0000 (19:11 +0000)]
am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '34e75a9bbaa9bb4c79cc31034ba353ace659aaa8':
  Media button intent should be send to current user only.

9 years agoam 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 19:11:07 +0000 (19:11 +0000)]
am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '238f03c9b38182c2e4347ece097b4cb18ba926ab':
  Fix for MidiManager bug

9 years agoam bde85f74: Merge "Fixed issue with background user window consuming touch events...
Wale Ogunwale [Mon, 20 Jul 2015 19:11:06 +0000 (19:11 +0000)]
am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit 'bde85f741c2ccbb7d719cdf0a48a607b104c3943':
  Fixed issue with background user window consuming touch events

9 years agoam eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain...
Christopher Tate [Mon, 20 Jul 2015 19:09:39 +0000 (19:09 +0000)]
am eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit 'eddb6c008be760f7339076de4fcc74ccc094b760':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoam 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 18:47:21 +0000 (18:47 +0000)]
am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug

9 years agoMerge "Fixed issue with background user window consuming touch events" into mnc-dev
Wale Ogunwale [Mon, 20 Jul 2015 18:45:58 +0000 (18:45 +0000)]
Merge "Fixed issue with background user window consuming touch events" into mnc-dev

9 years agoam 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification...
Christopher Tate [Mon, 20 Jul 2015 18:44:44 +0000 (18:44 +0000)]
am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '9606921b766435a93e5e992ae061d8983ade8085':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoam dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SET...
Billy Lau [Mon, 20 Jul 2015 18:43:56 +0000 (18:43 +0000)]
am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit 'dd0602e89daf6c458674efbcf01a5e0521f3c381':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into...
Jeff Sharkey [Mon, 20 Jul 2015 18:43:51 +0000 (18:43 +0000)]
am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '0fa2a56c3bc88cd4f3cddee99528c7e8a57af4d6':
  Better logging of MediaPlayer failure reason.

9 years agoam c1aaeead: am 698250fa: Merge "Media button intent should be send to current user...
Jean-Michel Trivi [Mon, 20 Jul 2015 18:43:47 +0000 (18:43 +0000)]
am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit 'c1aaeead6ed7bb685c7bd0b5e09de935913229ed':
  Media button intent should be send to current user only.

9 years agoam 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or...
Billy Lau [Mon, 20 Jul 2015 18:04:08 +0000 (18:04 +0000)]
am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps

9 years agoam 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 18:04:04 +0000 (18:04 +0000)]
am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '71780e79846d0ccc2aef2214041657410a8a14c2':
  Better logging of MediaPlayer failure reason.

9 years agoam 698250fa: Merge "Media button intent should be send to current user only." into...
Jean-Michel Trivi [Mon, 20 Jul 2015 18:04:01 +0000 (18:04 +0000)]
am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '698250fae7d82d8020d2b9038b9e9d68c9489b04':
  Media button intent should be send to current user only.

9 years agoam 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when...
Christopher Tate [Mon, 20 Jul 2015 18:03:55 +0000 (18:03 +0000)]
am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '0fc1e88c05e805324880a35b3f10126937824a79':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoMerge "Fix for MidiManager bug" into mnc-dev
Ricardo Garcia [Mon, 20 Jul 2015 18:03:41 +0000 (18:03 +0000)]
Merge "Fix for MidiManager bug" into mnc-dev

9 years agoMerge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WIND...
Billy Lau [Mon, 20 Jul 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

9 years agoam e2059303: (-s ours) am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d...
Geoff Mendal [Mon, 20 Jul 2015 17:45:15 +0000 (17:45 +0000)]
am e2059303: (-s ours) am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

9 years agoMerge "Better logging of MediaPlayer failure reason." into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Better logging of MediaPlayer failure reason." into mnc-dev

9 years agoBug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
Billy Lau [Mon, 20 Jul 2015 16:34:09 +0000 (17:34 +0100)]
Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb

9 years agoam 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up...
Christopher Tate [Mon, 20 Jul 2015 17:27:56 +0000 (17:27 +0000)]
am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '6afdad7e8863cb1fa3db5909e48269606fa76991':
  Don't fall back to domain verification state when looking up app linkage state

9 years agoMerge "Media button intent should be send to current user only." into mnc-dev
Jean-Michel Trivi [Mon, 20 Jul 2015 17:25:27 +0000 (17:25 +0000)]
Merge "Media button intent should be send to current user only." into mnc-dev

9 years agoam df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import...
Geoff Mendal [Mon, 20 Jul 2015 17:10:42 +0000 (17:10 +0000)]
am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

9 years agoMerge "Don't fall back to domain verification state when looking up app linkage state...
Christopher Tate [Mon, 20 Jul 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev

9 years agoBetter logging of MediaPlayer failure reason.
Jeff Sharkey [Mon, 20 Jul 2015 16:38:02 +0000 (09:38 -0700)]
Better logging of MediaPlayer failure reason.

Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01