OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Fix crash on second screenshot."
Doris Liu [Wed, 18 Nov 2015 18:53:49 +0000 (18:53 +0000)]
Merge "Fix crash on second screenshot."

8 years agoMerge "TextView setText/append methods set movement method"
Siyamed Sinir [Wed, 18 Nov 2015 18:32:22 +0000 (18:32 +0000)]
Merge "TextView setText/append methods set movement method"

8 years agoMerge "Tell the reason why IMMS unbinds IME client."
Yohei Yukawa [Wed, 18 Nov 2015 18:15:18 +0000 (18:15 +0000)]
Merge "Tell the reason why IMMS unbinds IME client."

8 years agoMerge "Make recents visible on resume unless requested otherwise."
Filip Gruszczynski [Wed, 18 Nov 2015 17:21:38 +0000 (17:21 +0000)]
Merge "Make recents visible on resume unless requested otherwise."

8 years agoMerge "Swtich from max_action_buttons resource to a method."
Filip Gruszczynski [Wed, 18 Nov 2015 17:04:13 +0000 (17:04 +0000)]
Merge "Swtich from max_action_buttons resource to a method."

8 years agoMake recents visible on resume unless requested otherwise.
Filip Gruszczynski [Wed, 18 Nov 2015 16:58:34 +0000 (08:58 -0800)]
Make recents visible on resume unless requested otherwise.

If the last interaction left recents invisible, we need to make the
visible again on their next resume.

Bug: 25754031
Change-Id: I4b1d4bae5609bf3f4a77250d3544084afd594536

8 years agoMerge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
Tony Mantler [Wed, 18 Nov 2015 16:47:41 +0000 (16:47 +0000)]
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"

8 years agoMerge "Cache notifications less aggressively."
Julia Reynolds [Wed, 18 Nov 2015 16:43:54 +0000 (16:43 +0000)]
Merge "Cache notifications less aggressively."

8 years agoMerge "Don't recreate remote views that already exist."
Julia Reynolds [Wed, 18 Nov 2015 16:37:59 +0000 (16:37 +0000)]
Merge "Don't recreate remote views that already exist."

8 years agoCache notifications less aggressively.
Julia Reynolds [Wed, 18 Nov 2015 16:12:53 +0000 (11:12 -0500)]
Cache notifications less aggressively.

Bug: 25694023
Change-Id: Ie8f1b518fdcb72cfbd982908aa30cdb8ebbb2f02

8 years agoMerge "Fix build"
Jason Monk [Wed, 18 Nov 2015 15:41:27 +0000 (15:41 +0000)]
Merge "Fix build"

8 years agoFix build
Jason Monk [Wed, 18 Nov 2015 15:40:34 +0000 (10:40 -0500)]
Fix build

Change-Id: Ib784f3b8e1f8e5166128a86d07b43859ee803765

8 years agoMerge "Properly remove GhostViews when Activity Transition canceled."
George Mount [Wed, 18 Nov 2015 15:37:39 +0000 (15:37 +0000)]
Merge "Properly remove GhostViews when Activity Transition canceled."

8 years agoMerge "Move some stuff to SettingsLib to use for Settings Home"
Jason Monk [Wed, 18 Nov 2015 15:08:02 +0000 (15:08 +0000)]
Merge "Move some stuff to SettingsLib to use for Settings Home"

8 years agoMove some stuff to SettingsLib to use for Settings Home
Jason Monk [Mon, 16 Nov 2015 20:59:53 +0000 (15:59 -0500)]
Move some stuff to SettingsLib to use for Settings Home

Change-Id: Id903747069fe83a896132714e580b1a1d7ee895c

8 years agoDon't recreate remote views that already exist.
Julia Reynolds [Wed, 18 Nov 2015 14:59:57 +0000 (09:59 -0500)]
Don't recreate remote views that already exist.

Bug: 25582071
Change-Id: Ie56225ec57ab43b2cab5ffb0198f283592e7bcd9

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Nov 2015 13:36:36 +0000 (05:36 -0800)]
Import translations. DO NOT MERGE

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

8 years agoTell the reason why IMMS unbinds IME client.
Yohei Yukawa [Wed, 18 Nov 2015 05:14:42 +0000 (21:14 -0800)]
Tell the reason why IMMS unbinds IME client.

As a preparation to fix Bug 25373872, this introduce an additional
parameter to IInputMethodClient.unbind() so that the IME client
that is running in the application side can know why IMMS needs
to unbind the connection.

In future the "unbindReason" parameter is supposed to be used to
optimize the behavior of IMM runtime running in the application process,
but for now it is not used unless we build the sytem with debug message
enabled.  Hence there should be no user-visible change with this CL.

Bug: 25373872
Change-Id: I74e83c8ca9d1d53e31e9c7b5bda1dec6274e59c8

8 years agoMerge "Factor out IMMS#resetCurrentMethodAndClient()."
Yohei Yukawa [Wed, 18 Nov 2015 03:56:45 +0000 (03:56 +0000)]
Merge "Factor out IMMS#resetCurrentMethodAndClient()."

8 years agoMerge "Fix crash with animation specs"
Chong Zhang [Wed, 18 Nov 2015 02:16:33 +0000 (02:16 +0000)]
Merge "Fix crash with animation specs"

8 years agoMerge "Fix issue #25727069: Top sleeping activity overrides foreground service"
Dianne Hackborn [Wed, 18 Nov 2015 02:05:30 +0000 (02:05 +0000)]
Merge "Fix issue #25727069: Top sleeping activity overrides foreground service"

8 years agoFix issue #25727069: Top sleeping activity overrides foreground service
Dianne Hackborn [Tue, 17 Nov 2015 19:14:43 +0000 (11:14 -0800)]
Fix issue #25727069: Top sleeping activity overrides foreground service

Change-Id: I9a085cd650604f9d6277ad343bf3c3852324cafc

8 years agoTextView setText/append methods set movement method
Siyamed Sinir [Mon, 16 Nov 2015 23:39:34 +0000 (15:39 -0800)]
TextView setText/append methods set movement method

Previously, TextView setText and append methods set the movement
method to LinkMovementMethod only when autoLink was enabled and
Linkify was able to find links in the input text. This CL adds the
case where autoLink is false, linksClickable is true, and the input
text contains ClickableSpans.

Fixes https://code.google.com/p/android/issues/detail?id=2219

Bug: 1712837
Change-Id: Ife4e35bac7f6cb48ad0dac6ecb4b90aec126fc73

8 years agoFix crash with animation specs
Chong Zhang [Wed, 18 Nov 2015 01:55:43 +0000 (17:55 -0800)]
Fix crash with animation specs

Change-Id: I72ed5b19aaede0c58ea0b8665409721824ec6480

8 years agoMerge "Introduce animated pointer icon for STYLE_WAIT."
Jun Mukai [Wed, 18 Nov 2015 01:46:58 +0000 (01:46 +0000)]
Merge "Introduce animated pointer icon for STYLE_WAIT."

8 years agoFactor out IMMS#resetCurrentMethodAndClient().
Yohei Yukawa [Wed, 18 Nov 2015 01:38:41 +0000 (17:38 -0800)]
Factor out IMMS#resetCurrentMethodAndClient().

As a preparation to fix Bug 25373872, this CL does a mechanical
code clean-ups in InputMethodManagerService.

As a follow up of I6c3186050592526fc95c5b27f18e2155acff5ebc, this CL
introduces IMMS#resetCurrentMethodAndClient() to make it clear when we
are resetting both IMMS->IME and IMMS->Apps connections.

This is literally mechanical.  No behavior change is intended.

Bug: 25373872
Change-Id: Ia4161854d9da71783fd028fcb79407e4b9463aee

8 years agoIntroduce animated pointer icon for STYLE_WAIT.
Jun Mukai [Wed, 28 Oct 2015 23:46:44 +0000 (16:46 -0700)]
Introduce animated pointer icon for STYLE_WAIT.

Change-Id: I893f8276e09351db6187c553f349008794b95690

8 years agoMerge changes Ib786d55e,Ibcda3d72
Wale Ogunwale [Wed, 18 Nov 2015 00:50:25 +0000 (00:50 +0000)]
Merge changes Ib786d55e,Ibcda3d72

* changes:
  Only add NonClientDecorView when needed
  Move management of BackdropFrameRenderer to DecorView

8 years agoCamera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am...
Eino-Ville Talvala [Tue, 17 Nov 2015 23:47:47 +0000 (23:47 +0000)]
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 am: 579cc90e61
am: b39fde2c42

* commit 'b39fde2c42b7bb4450eb40a19c6fe9c4f743bd9d':

8 years agoLog errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e...
Erik Wolsheimer [Tue, 17 Nov 2015 23:46:15 +0000 (23:46 +0000)]
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
am: 756b0d2ca2

* commit '756b0d2ca2e3bfb137becff666d33eb5734f796f':

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
Geoff Mendal [Tue, 17 Nov 2015 23:43:53 +0000 (23:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5  -s ours
am: 6dff6bc8cd  -s ours

* commit '6dff6bc8cde0f71752880b2495d65bd744c11060':

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours...
Geoff Mendal [Tue, 17 Nov 2015 23:42:23 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d  -s ours am: ee144ce3ba  -s ours
am: 73dedf661e  -s ours

* commit '73dedf661e8fb6ab77552a715f202dd6c602ddc5':

8 years agoOnly add NonClientDecorView when needed
Wale Ogunwale [Tue, 17 Nov 2015 23:41:05 +0000 (15:41 -0800)]
Only add NonClientDecorView when needed

We were previously adding it to all decor views because it was
required to be able to draw the resizing backdrop. We now manage
the resizing backdrop independently of the NonClientDecorView.

Bug: 25082500
Change-Id: Ib786d55eacd221e5d36a4afca9117d5409499674

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours...
Geoff Mendal [Tue, 17 Nov 2015 23:41:01 +0000 (23:41 +0000)]
Import translations. DO NOT MERGE am: 83d65fea01  -s ours am: a6c50551cd  -s ours am: 4510d17575  -s ours am: fb17593356  -s ours
am: 464ffe98cb  -s ours

* commit '464ffe98cb05906430890e767dd422eca8b9466d':

8 years agoMerge "Remove unsupported RS graphics API tests." am: 7ea808b177 am: 5a0a713147
Stephen Hines [Tue, 17 Nov 2015 23:39:29 +0000 (23:39 +0000)]
Merge "Remove unsupported RS graphics API tests." am: 7ea808b177 am: 5a0a713147
am: 96761ce3ad

* commit '96761ce3ad66dd29bf4c1586a09c69f214fb4b1d':
  Remove unsupported RS graphics API tests.

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 23:37:53 +0000 (23:37 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585  -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a
am: c85b56b0cb  -s ours

* commit 'c85b56b0cbdb712a20385df98d2c159b57f82cca':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 am: 97f92ce41e
Chad Brubaker [Tue, 17 Nov 2015 23:36:13 +0000 (23:36 +0000)]
Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 am: 97f92ce41e
am: 1627a091f4

* commit '1627a091f48d1295653d37a580e30f89005fb6e5':
  Add NetworkSecurityConfigProvider.install

8 years agoRevert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
Deepanshu Gupta [Tue, 17 Nov 2015 23:34:24 +0000 (23:34 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
am: 377cc4887d

* commit '377cc4887d3557377f63bfe9d179623985c9484e':
  Revert "LayoutLib: Fix true transparency in status bar."

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
Deepanshu Gupta [Tue, 17 Nov 2015 23:33:02 +0000 (23:33 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
am: dd97829cf2

* commit 'dd97829cf2b8599058f0410ea45bc84cd86e839b':
  AppCompatActionBar: use findClass to test presence

8 years agoMerge "Handle renamed packages during default grants" am: 140b101fcd am: 60cb22008c
Svetoslav Ganov [Tue, 17 Nov 2015 23:31:42 +0000 (23:31 +0000)]
Merge "Handle renamed packages during default grants" am: 140b101fcd am: 60cb22008c
am: 9bf367030c

* commit '9bf367030c24e93c711d2ba9ca5594e70a652596':
  Handle renamed packages during default grants

8 years agoMerge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c am: 358ad4980f
Colin Cross [Tue, 17 Nov 2015 23:30:18 +0000 (23:30 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c am: 358ad4980f
am: 68cea4e7d1

* commit '68cea4e7d17cf00ce3001cf23fe36a7f1e77fe86':
  Vibra: Add loading of the vibrator hardware module.

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9
Deepanshu Gupta [Tue, 17 Nov 2015 23:28:47 +0000 (23:28 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9
am: ab45fc1a4f

* commit 'ab45fc1a4f9726630322b7579168835d84711bdf':

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 23:27:26 +0000 (23:27 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7
am: 46f92eafe6  -s ours

* commit '46f92eafe669f3ae29299860bf79378ffa111898':

8 years agoMerge "Dedupe trust anchors" am: 690b5f6c0a am: e2caaea951
Chad Brubaker [Tue, 17 Nov 2015 23:25:52 +0000 (23:25 +0000)]
Merge "Dedupe trust anchors" am: 690b5f6c0a am: e2caaea951
am: d2347a89fb

* commit 'd2347a89fb1a01f550a1b17c68ee234958c1be42':
  Dedupe trust anchors

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am...
Bryce Lee [Tue, 17 Nov 2015 23:24:09 +0000 (23:24 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3
am: 4b60d12ef9

* commit '4b60d12ef99a31508be8aed18a53446255f94fc8':

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e...
Joe LaPenna [Tue, 17 Nov 2015 23:22:52 +0000 (23:22 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917  -s ours am: 7f0a1556ec  -s ours
am: 70e0b4239c  -s ours

* commit '70e0b4239c39799988ff007b21c3393b6f410452':

8 years agoMerge "Don\'t use timestamps with all zero" am: 9574e58027 am: be1a3f8b66
Eino-Ville Talvala [Tue, 17 Nov 2015 23:21:29 +0000 (23:21 +0000)]
Merge "Don\'t use timestamps with all zero" am: 9574e58027 am: be1a3f8b66
am: 7ca29b3ea2

* commit '7ca29b3ea287883c1c55c62a0e654a87cc81b75d':
  Don't use timestamps with all zero

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 23:20:08 +0000 (23:20 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78
am: 3bc8979d74

* commit '3bc8979d74e8a6c9e0a1c52031bfd0a810bccd1a':

8 years agoMerge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
Deepanshu Gupta [Tue, 17 Nov 2015 23:18:50 +0000 (23:18 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
am: ce400cd75e

* commit 'ce400cd75e1e1a90c0b4da4de90d7314fd21dca8':

8 years agoDO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c...
Michael Kwan [Tue, 17 Nov 2015 23:17:24 +0000 (23:17 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c  -s ours am: f23229f45f  -s ours
am: 6881185307  -s ours

* commit '6881185307c4f582996fb3a7792453b06857bebb':

8 years agoCamera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am...
Eino-Ville Talvala [Tue, 17 Nov 2015 23:16:02 +0000 (23:16 +0000)]
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9
am: f5b98ee1dc

* commit 'f5b98ee1dc05c2f9be839c56bf6e90bff99807bc':

8 years agoMerge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e...
Alex Klyubin [Tue, 17 Nov 2015 23:14:38 +0000 (23:14 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f
am: 00245ffce4

* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
  Insert Android Keystore JCA Provider at the correct position.

8 years agoMove AnimatedImageView and AuthenticatorHelper to SettingsLib
Tony Mantler [Tue, 17 Nov 2015 23:14:00 +0000 (15:14 -0800)]
Move AnimatedImageView and AuthenticatorHelper to SettingsLib

Change-Id: If3fef35b88b041326c510064679e92a90f31c6b2

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Erik Wolsheimer [Tue, 17 Nov 2015 23:13:36 +0000 (23:13 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoLog errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
Erik Wolsheimer [Tue, 17 Nov 2015 23:13:07 +0000 (23:13 +0000)]
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
am: 2fba776ee0

* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':

8 years agoLog errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
Erik Wolsheimer [Tue, 17 Nov 2015 23:11:59 +0000 (23:11 +0000)]
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
am: 2fba776ee0

* commit '2fba776ee0227e54f750dc6b87c8ca1bc1fd556f':

8 years agoMerge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 am: c53da...
Mark Salyzyn [Tue, 17 Nov 2015 23:10:30 +0000 (23:10 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 am: c53dad8d16
am: 45f88d02de

* commit '45f88d02deb8b78f72b7315b5d42567639ad7ece':
  Revert "jni: is loggable speedup, not within signal"

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
Geoff Mendal [Tue, 17 Nov 2015 23:09:06 +0000 (23:09 +0000)]
Import translations. DO NOT MERGE am: 83d65fea01  -s ours am: a6c50551cd  -s ours
am: c94a189e5f  -s ours

* commit 'c94a189e5f9ca87fdd314cae3c24c50aacf231dc':

8 years agoMove management of BackdropFrameRenderer to DecorView
Wale Ogunwale [Tue, 17 Nov 2015 22:47:52 +0000 (14:47 -0800)]
Move management of BackdropFrameRenderer to DecorView

Allows us to have the BackdropFrameRenderer independent of having
a NonClientDecorView.

Bug: 24810450
Change-Id: Ibcda3d722970536ee037b192e90e01da5650ac74

8 years agoMerge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am:...
Calin Juravle [Tue, 17 Nov 2015 23:07:36 +0000 (23:07 +0000)]
Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am: e20120031f
am: c3a70ce001

* commit 'c3a70ce0015e9117268040378c6adb6239ead897':
  Remove obsolete profile handling from AndroidRuntime.

8 years agoCamera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am...
Eino-Ville Talvala [Tue, 17 Nov 2015 23:05:48 +0000 (23:05 +0000)]
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0
am: 579cc90e61

* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':

8 years agoLog errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e...
Erik Wolsheimer [Tue, 17 Nov 2015 23:04:24 +0000 (23:04 +0000)]
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c
am: 7698dd970f

* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 17 Nov 2015 23:02:57 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 812794f0f5  -s ours

* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours
Geoff Mendal [Tue, 17 Nov 2015 23:01:15 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d  -s ours
am: ee144ce3ba  -s ours

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

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours...
Geoff Mendal [Tue, 17 Nov 2015 22:59:32 +0000 (22:59 +0000)]
Import translations. DO NOT MERGE am: 83d65fea01  -s ours am: a6c50551cd  -s ours am: 4510d17575  -s ours
am: fb17593356  -s ours

* commit 'fb175933566d5869e4d069334abec82f67665083':

8 years agoMerge "Add temporary layer alpha fallback to OpReorderer"
Chris Craik [Tue, 17 Nov 2015 22:53:40 +0000 (22:53 +0000)]
Merge "Add temporary layer alpha fallback to OpReorderer"

8 years agoAdd temporary layer alpha fallback to OpReorderer
Chris Craik [Mon, 16 Nov 2015 18:27:59 +0000 (10:27 -0800)]
Add temporary layer alpha fallback to OpReorderer

Also adds logic to clip temporary layers to viewport both for
efficiency and to allow large ones (such as the fallback case) to fit
in max texture size.

Change-Id: Iee51495220f5ca1dc7e6f5fd3615db2e896efd74

8 years agoMerge "Remove unsupported RS graphics API tests." am: 7ea808b177
Stephen Hines [Tue, 17 Nov 2015 22:37:34 +0000 (22:37 +0000)]
Merge "Remove unsupported RS graphics API tests." am: 7ea808b177
am: 5a0a713147

* commit '5a0a713147a76195ae21d53d065633f117271793':
  Remove unsupported RS graphics API tests.

8 years agoMerge "Remove unsupported RS graphics API tests."
Stephen Hines [Tue, 17 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Remove unsupported RS graphics API tests."
am: 7ea808b177

* commit '7ea808b17736f690eb8d23729f33e9a612b0492c':
  Remove unsupported RS graphics API tests.

8 years agoMerge "Remove unsupported RS graphics API tests."
Stephen Hines [Tue, 17 Nov 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Remove unsupported RS graphics API tests."

8 years agoNotifications can only have 1 topic.
Julia Reynolds [Tue, 17 Nov 2015 20:36:30 +0000 (15:36 -0500)]
Notifications can only have 1 topic.

Change-Id: Id0ab6bca352b969431d4ba68167074e514a98980

8 years agoMerge "Allow PO to clear password even if the same apk has DA"
Makoto Onuki [Tue, 17 Nov 2015 22:11:20 +0000 (22:11 +0000)]
Merge "Allow PO to clear password even if the same apk has DA"

8 years agoAllow PO to clear password even if the same apk has DA
Makoto Onuki [Tue, 17 Nov 2015 21:54:02 +0000 (13:54 -0800)]
Allow PO to clear password even if the same apk has DA

Bug 25645900

Change-Id: I7d2d9fbf6a4dc65ac63fb14e6ee6b9abc1f1c0e7

8 years agoMerge "Use correct rounding in View for potentially negative values"
Alan Viverette [Tue, 17 Nov 2015 21:44:14 +0000 (21:44 +0000)]
Merge "Use correct rounding in View for potentially negative values"

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 21:37:25 +0000 (21:37 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585  -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e
am: 8aa7e6a21a

* commit '8aa7e6a21a3428741159de2e28d87acb8b420e96':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge changes Id86e9773,I682afe1b
Wale Ogunwale [Tue, 17 Nov 2015 21:26:59 +0000 (21:26 +0000)]
Merge changes Id86e9773,I682afe1b

* changes:
  Moved BackdropFrameRenderer from NonClientDecorView to its own class file
  Moved management of NonClientDecorView from PhoneWindow to DecorView

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 21:18:16 +0000 (21:18 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585  -s ours am: 18a2ac0506 am: 08ed2bc083
am: 41ef58be3e

* commit '41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "Add NetworkSecurityConfigProvider.install" am: 08181cf647
Chad Brubaker [Tue, 17 Nov 2015 21:18:12 +0000 (21:18 +0000)]
Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install

8 years agoMerge "Allow DND mode to suppress visual interruptions."
Julia Reynolds [Tue, 17 Nov 2015 21:16:05 +0000 (21:16 +0000)]
Merge "Allow DND mode to suppress visual interruptions."

8 years agoAllow DND mode to suppress visual interruptions.
Julia Reynolds [Thu, 5 Nov 2015 21:48:55 +0000 (16:48 -0500)]
Allow DND mode to suppress visual interruptions.

Bug: 25423508
Change-Id: Idd8242e4bc00a749dbe0b5503c458375fc017072

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 20:59:42 +0000 (20:59 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585  -s ours am: 18a2ac0506
am: 08ed2bc083

* commit '08ed2bc083fe142ea6f89f97172543327f423e61':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "Add NetworkSecurityConfigProvider.install"
Chad Brubaker [Tue, 17 Nov 2015 20:59:04 +0000 (20:59 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install

8 years agoSwtich from max_action_buttons resource to a method.
Filip Gruszczynski [Tue, 17 Nov 2015 20:24:49 +0000 (12:24 -0800)]
Swtich from max_action_buttons resource to a method.

We want to limit the number of size thresholds that an application will
report. Instead of using a dimen resource that will increase the number
of thresholds, we calculate the max number of action buttons dynamically
in code.

Bug: 25394588
Change-Id: I8ece331cd02fb116b49734003cec112708d27f85

8 years agoRevert "LayoutLib: Fix true transparency in status bar."
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:07 +0000 (20:50 +0000)]
Revert "LayoutLib: Fix true transparency in status bar."
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."

8 years agoProperly remove GhostViews when Activity Transition canceled.
George Mount [Tue, 17 Nov 2015 20:49:22 +0000 (12:49 -0800)]
Properly remove GhostViews when Activity Transition canceled.

Bug 25744941

When the returning Activity finished without transferring the
shared element, the shared elements in the underlying Activity
were left as GhostViews. This CL transfers the shared elements
back when the shared element transition is canceled.

Change-Id: I9062f1d439bb5364ac939788c67b20a739c0627b

8 years agoMerge "Add NetworkSecurityConfigProvider.install"
Chad Brubaker [Tue, 17 Nov 2015 20:46:49 +0000 (20:46 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126
Deepanshu Gupta [Tue, 17 Nov 2015 20:43:02 +0000 (20:43 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 am: e45abdb126
am: 606e5a0c56

* commit '606e5a0c562a461919e90ddf1e41036d926c9716':
  LayoutLib: IntelliJ changed project files.

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 20:41:39 +0000 (20:41 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585  -s ours
am: 18a2ac0506

* commit '18a2ac0506ec834c2522de94040dab9e77304e7b':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 20:41:30 +0000 (20:41 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 am: cd00ba1a71
am: 526c98cb7f  -s ours

* commit '526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 20:32:31 +0000 (20:32 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence

8 years agoRevert "LayoutLib: Fix true transparency in status bar."
Deepanshu Gupta [Tue, 17 Nov 2015 19:42:42 +0000 (11:42 -0800)]
Revert "LayoutLib: Fix true transparency in status bar."

This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
Deepanshu Gupta [Tue, 17 Nov 2015 20:24:20 +0000 (20:24 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
am: e45abdb126

* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
  LayoutLib: IntelliJ changed project files.

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405
Michael Wright [Tue, 17 Nov 2015 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405
am: bd23716585  -s ours

* commit 'bd23716585bd21b4dc4bf87bd56ce588c8d457df':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "Handle renamed packages during default grants" am: 140b101fcd
Svetoslav Ganov [Tue, 17 Nov 2015 20:24:06 +0000 (20:24 +0000)]
Merge "Handle renamed packages during default grants" am: 140b101fcd
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 20:22:43 +0000 (20:22 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev

8 years agoMoved BackdropFrameRenderer from NonClientDecorView to its own class file
Wale Ogunwale [Tue, 17 Nov 2015 19:26:56 +0000 (11:26 -0800)]
Moved BackdropFrameRenderer from NonClientDecorView to its own class file

Bug: 24810450
Change-Id: Id86e97733161499bbc59617433792f5ddc4e7f9e

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de
Michael Wright [Tue, 17 Nov 2015 20:06:27 +0000 (20:06 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de
am: 614ea46405

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW

8 years agoMerge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c
Colin Cross [Tue, 17 Nov 2015 20:06:25 +0000 (20:06 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c
am: 358ad4980f

* commit '358ad4980fd6ea0ed22e81b3816572ec9ba39f53':
  Vibra: Add loading of the vibrator hardware module.

8 years agoMerge "Handle renamed packages during default grants"
Svetoslav Ganov [Tue, 17 Nov 2015 20:06:21 +0000 (20:06 +0000)]
Merge "Handle renamed packages during default grants"
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9
Deepanshu Gupta [Tue, 17 Nov 2015 20:06:20 +0000 (20:06 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9
am: 66840955d8

* commit '66840955d817b2ca42a4a573dd9186b5ad5b25aa':
  LayoutLib: IntelliJ changed project files.