OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2...
Adrian Roos [Tue, 20 Oct 2015 01:18:09 +0000 (01:18 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 am: 574b5f71e8 am: 011f9eb1fc
am: 0fdcc66177

* commit '0fdcc6617769d8198012a92527c6aff2ced4831f':
  Reload content description of KeyButtonView

8 years agoMerge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googles...
Todd Kennedy [Tue, 20 Oct 2015 01:17:20 +0000 (01:17 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: ec8a4ecc92 am: 7e5b18a9dd
am: 78891b64c9

* commit '78891b64c9245fd0780fa4559b018d4279766fb4':

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86...
Todd Kennedy [Tue, 20 Oct 2015 01:16:19 +0000 (01:16 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 am: e9c7512147
am: eede174f7b

* commit 'eede174f7b7ee6fa8f1ad7de237c1d647a5db05f':
  Set host when restoring a fragment

8 years agoMerge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev...
Mathieu Chartier [Tue, 20 Oct 2015 01:15:28 +0000 (01:15 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b am: efa447e1ab
am: a6358d93a0

* commit 'a6358d93a0f1cbc6469c226f7a77858e00b7de77':
  Fix read_mapinfo to recognize free list large object space

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82...
Svetoslav Ganov [Tue, 20 Oct 2015 01:14:04 +0000 (01:14 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad am: 2a95159d2c
am: 7fdc5d95ad

* commit '7fdc5d95ada01a378877d6a7c8be1894eb869e04':
  Don't allow concurrent permission requests.

8 years agoam 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initi...
Aravind Akella [Tue, 20 Oct 2015 01:12:52 +0000 (01:12 +0000)]
am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a
am: fd81002e71

* commit 'fd81002e719737696c1c5913f2ba77f2e28883f3':
  Fix a possible race condition in SensorManager initialization.

8 years agoMerge "Add device model name to MtpDocumentsProvider's roots."
Daichi Hirono [Tue, 20 Oct 2015 00:47:07 +0000 (00:47 +0000)]
Merge "Add device model name to MtpDocumentsProvider's roots."

8 years agoMerge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2...
Adrian Roos [Tue, 20 Oct 2015 00:32:09 +0000 (00:32 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 am: 574b5f71e8
am: 011f9eb1fc

* commit '011f9eb1fcdfd5bda83185ee2190664b3bc3f22f':
  Reload content description of KeyButtonView

8 years agoMerge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googles...
Todd Kennedy [Mon, 19 Oct 2015 23:53:37 +0000 (23:53 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: ec8a4ecc92
am: 7e5b18a9dd

* commit '7e5b18a9ddfff06f01cb97dbea12ae58a662870e':

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952
Todd Kennedy [Mon, 19 Oct 2015 23:52:37 +0000 (23:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952
am: e9c7512147

* commit 'e9c751214715f3d136ae07fe9f553c488d01f352':
  Set host when restoring a fragment

8 years agoMerge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev...
Mathieu Chartier [Mon, 19 Oct 2015 23:51:35 +0000 (23:51 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b
am: efa447e1ab

* commit 'efa447e1ab5a51c96219fc1d6204c128dbbaf661':
  Fix read_mapinfo to recognize free list large object space

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82...
Svetoslav Ganov [Mon, 19 Oct 2015 23:50:28 +0000 (23:50 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.

8 years agoMerge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2
Adrian Roos [Mon, 19 Oct 2015 23:50:19 +0000 (23:50 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2
am: 574b5f71e8

* commit '574b5f71e80cb5b205dcca2d9ef33820e33a850e':
  Reload content description of KeyButtonView

8 years agoMerge "Reload content description of KeyButtonView" into mnc-dr-dev
Adrian Roos [Mon, 19 Oct 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
am: 9a345f31f2

* commit '9a345f31f23fc581f9ce501e854c821e865920ca':
  Reload content description of KeyButtonView

8 years agoMerge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googles...
Todd Kennedy [Mon, 19 Oct 2015 23:32:29 +0000 (23:32 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am: ec8a4ecc92

* commit 'ec8a4ecc9210fa509283a860bb91814f28d28a4f':

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d
Todd Kennedy [Mon, 19 Oct 2015 23:31:34 +0000 (23:31 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d
am: d419d86952

* commit 'd419d86952fd962e34011eb3d989f748e678691d':
  Set host when restoring a fragment

8 years agoMerge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev...
Mathieu Chartier [Mon, 19 Oct 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5
am: df0cc41a7b

* commit 'df0cc41a7bfa480ce5584420bceda850ad0c56c8':
  Fix read_mapinfo to recognize free list large object space

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82
Svetoslav Ganov [Mon, 19 Oct 2015 23:28:55 +0000 (23:28 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82
am: aebff7f1ad

* commit 'aebff7f1ad23299d1ed71e83a3e76619a1a03574':
  Don't allow concurrent permission requests.

8 years agoMerge "Reload content description of KeyButtonView" into mnc-dr-dev
Adrian Roos [Mon, 19 Oct 2015 23:26:47 +0000 (23:26 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev

8 years agoMerge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesou...
Todd Kennedy [Mon, 19 Oct 2015 23:25:04 +0000 (23:25 +0000)]
Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 23:22:57 +0000 (23:22 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 23:19:51 +0000 (23:19 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment

8 years agoMerge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 23:17:09 +0000 (23:17 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
  Fix read_mapinfo to recognize free list large object space

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev
Svetoslav Ganov [Mon, 19 Oct 2015 23:13:46 +0000 (23:13 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.

8 years agoMerge "Use null GL for unit tests/microbench"
Chris Craik [Mon, 19 Oct 2015 22:59:23 +0000 (22:59 +0000)]
Merge "Use null GL for unit tests/microbench"

8 years agoUse null GL for unit tests/microbench
Chris Craik [Mon, 19 Oct 2015 18:22:11 +0000 (11:22 -0700)]
Use null GL for unit tests/microbench

Change-Id: Ie6234f03d8561b71fc2ebd149ddd7334f275d7c5

8 years agoMerge "Set host when restoring a fragment" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 22:52:27 +0000 (22:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev

8 years agoMerge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev

8 years agoFix read_mapinfo to recognize free list large object space
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space

Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2

8 years agoMerge "Don't allow concurrent permission requests." into mnc-dr-dev
Svetoslav Ganov [Mon, 19 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Don't allow concurrent permission requests." into mnc-dr-dev

8 years agoMerge "Set the bounds on the drawable for ChangeBounds reparenting."
George Mount [Mon, 19 Oct 2015 22:20:52 +0000 (22:20 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting."

8 years agoMerge "Fix trace end in inflate"
John Reck [Mon, 19 Oct 2015 22:00:54 +0000 (22:00 +0000)]
Merge "Fix trace end in inflate"

8 years agoMerge "Decouple gesture detection."
Steve McKay [Mon, 19 Oct 2015 22:00:39 +0000 (22:00 +0000)]
Merge "Decouple gesture detection."

8 years agoDecouple gesture detection.
Steve McKay [Mon, 19 Oct 2015 19:04:21 +0000 (12:04 -0700)]
Decouple gesture detection.

DirectoryFragment now uses an independent gesture detector.
Move early event-handling logic out of listener into the handler class.

Change-Id: Ie8a01b1507c8a8aa74355ead38feb7b802029540

8 years agoam 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initi...
Aravind Akella [Mon, 19 Oct 2015 21:41:36 +0000 (21:41 +0000)]
am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a

* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.

8 years agoam 005d36d1: Merge "Fix a possible race condition in SensorManager initialization...
Aravind Akella [Mon, 19 Oct 2015 21:36:10 +0000 (21:36 +0000)]
am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a

* commit '005d36d1b0653fccc5aaea2af36a2622f6d74f34':
  Fix a possible race condition in SensorManager initialization.

8 years agoMerge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:32:25 +0000 (21:32 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
am: a817c90a7a

* commit 'a817c90a7ab296473345b0e106acc9be4e5b678c':
  Fix a possible race condition in SensorManager initialization.

8 years agoMerge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:15:28 +0000 (21:15 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev

8 years agoSet the bounds on the drawable for ChangeBounds reparenting.
George Mount [Mon, 19 Oct 2015 19:14:01 +0000 (12:14 -0700)]
Set the bounds on the drawable for ChangeBounds reparenting.

Bug 24993183

The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.

Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584

8 years agoSet host when restoring a fragment
Todd Kennedy [Mon, 19 Oct 2015 19:48:55 +0000 (12:48 -0700)]
Set host when restoring a fragment

When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.

Bug: 22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad

8 years agoFix trace end in inflate
John Reck [Mon, 19 Oct 2015 19:46:09 +0000 (12:46 -0700)]
Fix trace end in inflate

Change-Id: I62809d70410a045231c8210ecd94a0bfc5e2d2fb

8 years agoMerge "Clean up VectorDrawable usage of stroke and fill color state lists"
Alan Viverette [Mon, 19 Oct 2015 19:34:16 +0000 (19:34 +0000)]
Merge "Clean up VectorDrawable usage of stroke and fill color state lists"

8 years agoClean up VectorDrawable usage of stroke and fill color state lists
Alan Viverette [Mon, 19 Oct 2015 19:18:53 +0000 (15:18 -0400)]
Clean up VectorDrawable usage of stroke and fill color state lists

Only store stateful CSLs; otherwise, just use the default (e.g. the
only available) color.

Bug: 25074102
Change-Id: I050c89841d4c6bf22473a66c713a845b0358dc94

8 years agoFix a possible race condition in SensorManager initialization.
Aravind Akella [Fri, 16 Oct 2015 21:18:40 +0000 (14:18 -0700)]
Fix a possible race condition in SensorManager initialization.

Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc

8 years agoMerge "Use LinearStdAllocator in DisplayList"
Chris Craik [Mon, 19 Oct 2015 19:14:56 +0000 (19:14 +0000)]
Merge "Use LinearStdAllocator in DisplayList"

8 years agoUse LinearStdAllocator in DisplayList
Chris Craik [Fri, 16 Oct 2015 21:23:12 +0000 (14:23 -0700)]
Use LinearStdAllocator in DisplayList

bug:24300128

This removes most of the remaining calls to malloc when
recording DisplayLists.

Change-Id: If928bd53dac0f145aadc436a62759086b67da0ed

8 years agoMerge "Remove GLTrace support"
Pablo Ceballos [Mon, 19 Oct 2015 17:55:59 +0000 (17:55 +0000)]
Merge "Remove GLTrace support"

8 years agoMerge "Fix: input source comparison -> MotionEvent.isFromSource"
Jun Mukai [Mon, 19 Oct 2015 17:23:23 +0000 (17:23 +0000)]
Merge "Fix: input source comparison -> MotionEvent.isFromSource"

8 years agoMerge "Fix: input source comparison -> MotionEvent.isFromSource()"
Jun Mukai [Mon, 19 Oct 2015 17:23:08 +0000 (17:23 +0000)]
Merge "Fix: input source comparison -> MotionEvent.isFromSource()"

8 years agoMerge "Enable explicit package for quick view intent."
Steve McKay [Mon, 19 Oct 2015 16:30:09 +0000 (16:30 +0000)]
Merge "Enable explicit package for quick view intent."

8 years agoam 06efcdc6: (-s ours) am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import...
Geoff Mendal [Mon, 19 Oct 2015 16:11:50 +0000 (16:11 +0000)]
am 06efcdc6: (-s ours) am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

* commit '06efcdc6bed934ac3c138a380728f6b11e051f28':
  Import translations. DO NOT MERGE

8 years agoam e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)]
am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

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

8 years agoam a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev...
Geoff Mendal [Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:59:20 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 7ba59c3559  -s ours

* commit '7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 19 Oct 2015 15:46:17 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Suppress testAndroidTestCaseSetupProperly"
Stuart Scott [Mon, 19 Oct 2015 15:31:24 +0000 (15:31 +0000)]
Merge "Suppress testAndroidTestCaseSetupProperly"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:58:48 +0000 (07:58 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Add Notification topics."
Julia Reynolds [Mon, 19 Oct 2015 14:38:40 +0000 (14:38 +0000)]
Merge "Add Notification topics."

8 years agoMerge "Removing period from No service string to be consistent with Airplane Mode"
Ian Pedowitz [Mon, 19 Oct 2015 14:32:57 +0000 (14:32 +0000)]
Merge "Removing period from No service string to be consistent with Airplane Mode"

8 years agoam 69988b3c: (-s ours) am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translati...
Geoff Mendal [Mon, 19 Oct 2015 14:29:29 +0000 (14:29 +0000)]
am 69988b3c: (-s ours) am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e  -s ours

* commit '69988b3cee1df8fd1fee9ae2041a0981cc491bd2':
  Import translations. DO NOT MERGE

8 years agoam ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am...
Geoff Mendal [Mon, 19 Oct 2015 14:22:21 +0000 (14:22 +0000)]
am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e  -s ours

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

8 years agoMerge "update metrics enums"
Chris Wren [Mon, 19 Oct 2015 14:17:44 +0000 (14:17 +0000)]
Merge "update metrics enums"

8 years agoam 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours
Geoff Mendal [Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)]
am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e  -s ours

* commit '2a09706e86794f6482f005f5bcca2ee513a3b1d9':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:11:34 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am: 5e4863205e  -s ours

* commit '5e4863205ee459cd8813f45e91b2e67c603d38ef':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:54:12 +0000 (05:54 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Remove MinikinSkiaFont::GetGlyph."
Seigo Nonaka [Mon, 19 Oct 2015 04:07:44 +0000 (04:07 +0000)]
Merge "Remove MinikinSkiaFont::GetGlyph."

8 years agoam fec413db: am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks...
Chris Wren [Sat, 17 Oct 2015 21:51:09 +0000 (21:51 +0000)]
am fec413db: am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit 'fec413dbeae1a5afef833ad883d36bdd2a6af105':
  count notification peeks by window action

8 years agoam 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window...
Chris Wren [Sat, 17 Oct 2015 21:46:00 +0000 (21:46 +0000)]
am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit '9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
  count notification peeks by window action

8 years agoam 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into...
Chris Wren [Sat, 17 Oct 2015 21:41:39 +0000 (21:41 +0000)]
am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit '3472f18e0218c7d7a991da50db8251471fd8c25d':
  count notification peeks by window action

8 years agoam c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
Chris Wren [Sat, 17 Oct 2015 21:35:25 +0000 (21:35 +0000)]
am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action

8 years agoMerge "count notification peeks by window action" into mnc-dr-dev
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev

8 years agoRemoving period from No service string to be consistent with Airplane Mode
Ian Pedowitz [Sat, 17 Oct 2015 21:08:13 +0000 (14:08 -0700)]
Removing period from No service string to be consistent with Airplane Mode

Bug: 25037917
Change-Id: Iaa1099fb06f724ebeb7d6302a78b8d010871668e

8 years agoam 462b8b39: am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calcu...
Ruben Brunk [Sat, 17 Oct 2015 07:19:43 +0000 (07:19 +0000)]
am 462b8b39: am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '462b8b3986fd194e08c78d66b6cc547af7388830':
  Fix lens shading map origin calculation.

8 years agoam 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:13:24 +0000 (07:13 +0000)]
am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
  Fix lens shading map origin calculation.

8 years agoam 7a027807: am c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:07:32 +0000 (07:07 +0000)]
am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '7a027807a73aaa578d8f7a457438daac73158af0':
  Fix lens shading map origin calculation.

8 years agoam c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:01:19 +0000 (07:01 +0000)]
am c03443b2: Fix lens shading map origin calculation.

* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.

8 years agoFix lens shading map origin calculation.
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.

Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486

8 years agoMerge "Reset lock pattern stealth mode when keygueard pattern view is reset"
Toni Barzic [Sat, 17 Oct 2015 01:33:58 +0000 (01:33 +0000)]
Merge "Reset lock pattern stealth mode when keygueard pattern view is reset"

8 years agoReload content description of KeyButtonView
Adrian Roos [Fri, 16 Oct 2015 23:51:04 +0000 (16:51 -0700)]
Reload content description of KeyButtonView

Reload the content description whenever the
configuration changes.

Bug: 24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38

8 years agoam 4d655e7b: am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers...
Selim Cinek [Fri, 16 Oct 2015 23:49:13 +0000 (23:49 +0000)]
am 4d655e7b: am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit '4d655e7b98eebba4e3b4912f508f789719e5e7b1':
  Stopping chronometers now when the shade is closed

8 years agoam 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the...
Selim Cinek [Fri, 16 Oct 2015 23:44:59 +0000 (23:44 +0000)]
am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit '4135092ce9381d5545f6ef1625a348c969614b33':
  Stopping chronometers now when the shade is closed

8 years agoam 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed...
Selim Cinek [Fri, 16 Oct 2015 23:40:12 +0000 (23:40 +0000)]
am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit '303e5c410c17b2be84051b3692635e6e24e37530':
  Stopping chronometers now when the shade is closed

8 years agoam b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc...
Selim Cinek [Fri, 16 Oct 2015 23:34:43 +0000 (23:34 +0000)]
am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit 'b9a73d2ce34b35684a282c8521d65f52fea1197a':
  Stopping chronometers now when the shade is closed

8 years agoEnable explicit package for quick view intent.
Steve McKay [Thu, 15 Oct 2015 22:27:30 +0000 (15:27 -0700)]
Enable explicit package for quick view intent.

Define the package in config...suitable for setup via overlay.
Undefined by default makes the feature disabled on phones...n stuff.
Fall back to single-file QUICK_VIEW.
Work around 24963914 (for now).

Bug: 24963914
Change-Id: Ia9c5a606d294ae053fd5e60d015f0aa0010eba4f

8 years agoMerge "Fixes in FalsingManager Classifiers and Evaluators and in DragDownHelper"
Selim Cinek [Fri, 16 Oct 2015 23:33:22 +0000 (23:33 +0000)]
Merge "Fixes in FalsingManager Classifiers and Evaluators and in DragDownHelper"

8 years agoMerge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
Selim Cinek [Fri, 16 Oct 2015 23:28:46 +0000 (23:28 +0000)]
Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

8 years agoStopping chronometers now when the shade is closed
Selim Cinek [Mon, 21 Sep 2015 13:47:20 +0000 (15:47 +0200)]
Stopping chronometers now when the shade is closed

Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12

8 years agoMerge "Add shift-selection to DocumentsUI."
Ben Kwa [Fri, 16 Oct 2015 22:44:04 +0000 (22:44 +0000)]
Merge "Add shift-selection to DocumentsUI."

8 years agoam adf38ccb: am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accoun...
Bryce Lee [Fri, 16 Oct 2015 22:42:43 +0000 (22:42 +0000)]
am adf38ccb: am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

* commit 'adf38ccb6ea0a3b406273061d1fc01f61bc6abb6':
  Add capability to identify phone accounts that are emergency only.

8 years agoam 4b4ac110: (-s ours) am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity...
Matthew Williams [Fri, 16 Oct 2015 22:42:31 +0000 (22:42 +0000)]
am 4b4ac110: (-s ours) am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit '4b4ac1103e0fb54956425f81fda8c6b2893a6c59':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoAdd shift-selection to DocumentsUI.
Ben Kwa [Wed, 7 Oct 2015 21:15:12 +0000 (14:15 -0700)]
Add shift-selection to DocumentsUI.

- Move the key listener from BaseActivity into DirectoryFragment, where it
belongs.
- Add code to detect the shift key during keyboard navigation, and
extend the selection in that case.

BUG=20859059

Change-Id: Ia7d3c7d4343f0185873deeaf1a35028a716b6e19

8 years agoMerge "Revert "Dont update thumbnails of freeform windows on focus change""
Wale Ogunwale [Fri, 16 Oct 2015 22:38:13 +0000 (22:38 +0000)]
Merge "Revert "Dont update thumbnails of freeform windows on focus change""

8 years agoam b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are...
Bryce Lee [Fri, 16 Oct 2015 22:33:23 +0000 (22:33 +0000)]
am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

* commit 'b70426b197c373ccd8ab46c080fedf66e43d52e3':
  Add capability to identify phone accounts that are emergency only.

8 years agoam c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics...
Matthew Williams [Fri, 16 Oct 2015 22:33:17 +0000 (22:33 +0000)]
am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit 'c85315acdf028d09b178e2c9a6ec66374652894a':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoam 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency...
Bryce Lee [Fri, 16 Oct 2015 22:29:32 +0000 (22:29 +0000)]
am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

* commit '4c9fcd5412a190c6e73f25346cf13c67286fa01e':
  Add capability to identify phone accounts that are emergency only.

8 years agoam 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
Matthew Williams [Fri, 16 Oct 2015 22:29:26 +0000 (22:29 +0000)]
am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit '9a365194861e78dd5edbebf292aaa7e48804ab46':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoMerge "Change wrong doc about using linear interpolator."
George Mount [Fri, 16 Oct 2015 22:27:48 +0000 (22:27 +0000)]
Merge "Change wrong doc about using linear interpolator."