git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:35:36 +0000 (00:35 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad
am: 74ebf3ec67

* commit '74ebf3ec67ddbbf7752da120a57c4624d4e1655f':
Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 24 May 2016 00:31:05 +0000 (00:31 +0000)]

Merge "Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 938c4e3564" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:30:38 +0000 (00:30 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad
am: b917a0e6be

* commit 'b917a0e6be841d23ff56c54b03abb42b3a93d930':
PIP: Handle configuration changes

Change-Id: I018fc45368eff5fbe9ba5d6f21b00d616e622010

commit | commitdiff | tree

Dianne Hackborn [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]

Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am: 9c252700f6

* commit '9c252700f6686767f5418677800ba171f441dddc':
Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad
am: 938c4e3564

* commit '938c4e356417360e161dcf7a9eba2524f13373f0':
PIP: Handle configuration changes

Change-Id: Ida8a222a813f462e3b6766c572d53ffcf7995e78

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:22:31 +0000 (00:22 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes

Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:22:27 +0000 (00:22 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes

Change-Id: Ic01a93b2031693b9051312598c084e871d84fedc

commit | commitdiff | tree

Dianne Hackborn [Tue, 24 May 2016 00:18:38 +0000 (00:18 +0000)]

Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev

commit | commitdiff | tree

Jaewan Kim [Tue, 24 May 2016 00:05:26 +0000 (00:05 +0000)]

Merge "PIP: Handle configuration changes" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 23:38:29 +0000 (23:38 +0000)]

Merge "Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 am: b21c227a39" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Mon, 23 May 2016 23:37:58 +0000 (23:37 +0000)]

Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45
am: b21c227a39

* commit 'b21c227a39df2bec9488e9eabec9dfe6e34b9bb5':
Support DHCPv4 rebinding state

Change-Id: Ib880d8bdd9230b76247ffadeef66b2a11dae2435

commit | commitdiff | tree

Erik Kline [Mon, 23 May 2016 23:37:42 +0000 (23:37 +0000)]

Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45
am: 648d51fc5d

* commit '648d51fc5dfcbb7c9b33f247eb0b32631d34835d':
Support DHCPv4 rebinding state

Change-Id: I171247f1a930f97b361a774f74a90b29aad84fc7

commit | commitdiff | tree

Erik Kline [Mon, 23 May 2016 23:29:07 +0000 (23:29 +0000)]

Merge "Support DHCPv4 rebinding state" into nyc-dev
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state

Change-Id: I885181616444d19974085637f80f459c9152ac7d

commit | commitdiff | tree

Erik Kline [Mon, 23 May 2016 23:28:57 +0000 (23:28 +0000)]

Merge "Support DHCPv4 rebinding state" into nyc-dev
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state

Change-Id: If31de53174e64e154152b7baa60f23a387092e87

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 23:28:37 +0000 (23:28 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 3067da37c1

* commit '3067da37c1e945245274ae638373f200d0ff2d29':
Additional clean up in onUserRemovedLPw

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 23:24:32 +0000 (23:24 +0000)]

Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 6d2e1e45f0" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 23:23:55 +0000 (23:23 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 6d2e1e45f0

* commit '6d2e1e45f008f1f179fee4d5c966dfdbb31b45ed':
Deprecate unnecessairy Notification.Style constructors

Change-Id: I7c420fe8cf54cb3e08341a073d5abd7ce0d0ebd7

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 23:23:40 +0000 (23:23 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84

commit | commitdiff | tree

Erik Kline [Mon, 23 May 2016 23:19:03 +0000 (23:19 +0000)]

Merge "Support DHCPv4 rebinding state" into nyc-dev

commit | commitdiff | tree

Fyodor Kupolov [Mon, 23 May 2016 23:18:15 +0000 (23:18 +0000)]

Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 23:15:29 +0000 (23:15 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 23:14:35 +0000 (23:14 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890

commit | commitdiff | tree

TreeHugger Robot [Mon, 23 May 2016 23:04:35 +0000 (23:04 +0000)]

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev

commit | commitdiff | tree

Dianne Hackborn [Mon, 23 May 2016 21:39:45 +0000 (14:39 -0700)]

Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Uh, yeah.

Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e

commit | commitdiff | tree

Fyodor Kupolov [Mon, 23 May 2016 21:22:38 +0000 (14:22 -0700)]

Additional clean up in onUserRemovedLPw

mDefaultPermissionsGranted, mFingerprints should be cleaned up.

Bug: 28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 21:11:43 +0000 (21:11 +0000)]

Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: 7399079b5b" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 21:10:26 +0000 (21:10 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29
am: 7399079b5b

* commit '7399079b5b6af59aceba6c4a4070fdf7afe432c0':
Only resuming starting dontWaitForPause activity once

Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca

commit | commitdiff | tree

Wale Ogunwale [Mon, 23 May 2016 21:10:09 +0000 (21:10 +0000)]

Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev am: 42d4a337a3
am: 22ff8d0779

* commit '22ff8d07796a9fc382bc364bae490dec9d258ec5':
Only resuming starting dontWaitForPause activity once

Change-Id: Idd556009a345aee1b7166934aaccfbd4c2e1787f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 21:07:20 +0000 (21:07 +0000)]

Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: bbcf18dbfd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 21:06:33 +0000 (21:06 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29
am: bbcf18dbfd

* commit 'bbcf18dbfd7e3e96ee14b1ee30b6ba99f99ff252':
Recording activity notification: return list of configuration

Change-Id: Ia0456b55cb097f2c5d2206f898c72bed90b867c2

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 21:06:05 +0000 (21:06 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29
am: f2c8fb8620

* commit 'f2c8fb8620224eecfbc344a203e32e6563afcfd6':
Recording activity notification: return list of configuration

Change-Id: I795d0a76efd044630cd275060dd6c11d595f0e82

commit | commitdiff | tree

Adrian Roos [Mon, 23 May 2016 20:56:15 +0000 (13:56 -0700)]

Deprecate unnecessairy Notification.Style constructors

Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574

commit | commitdiff | tree

Wale Ogunwale [Mon, 23 May 2016 20:59:00 +0000 (20:59 +0000)]

Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once

Change-Id: I5cc6a322d6c3cdd9bd28ea4a996fe960b1cefd81

commit | commitdiff | tree

Wale Ogunwale [Mon, 23 May 2016 20:58:58 +0000 (20:58 +0000)]

Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once

Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 20:56:04 +0000 (20:56 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 20:55:58 +0000 (20:55 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489

commit | commitdiff | tree

TreeHugger Robot [Mon, 23 May 2016 20:51:39 +0000 (20:51 +0000)]

Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)]

Merge "Recording activity notification: return list of configuration" into nyc-dev

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 20:10:23 +0000 (20:10 +0000)]

Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7
am: ae8b7259f5

* commit 'ae8b7259f59eb3208517f6e3558b9ba991f39b96':

Change-Id: Iebc60c74712a3d1b259f7d10d68aee850be79cc5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 20:07:57 +0000 (20:07 +0000)]

Merge "Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 am: 7143013049" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 20:07:47 +0000 (20:07 +0000)]

Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 am: 7f26540426" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 20:07:16 +0000 (20:07 +0000)]

Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7
am: 7143013049

* commit '71430130496299138f1f65875a2162927883412e':
Make battery labels translatable.

Change-Id: I503c0c66b06e076dfa2ea36f6a14828cbc7c5d6b

commit | commitdiff | tree

Sid Soundararajan [Mon, 23 May 2016 20:07:12 +0000 (20:07 +0000)]

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92
am: 7f26540426

* commit '7f2654042655d32714cc59fd857f24fc7b284f77':
Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I3aba988e5e61c51d67180aad0d7eb1f41b78c245

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 20:07:08 +0000 (20:07 +0000)]

Merge "Make battery labels translatable." into nyc-dev
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.

Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9

commit | commitdiff | tree

Sid Soundararajan [Mon, 23 May 2016 20:07:01 +0000 (20:07 +0000)]

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92
am: 809bb0f195

* commit '809bb0f1957d92e9fc3a84c56573dddd6ce50162':
Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: Icd9595a35f31b4e669bf6e66afd2073fc170e274

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 20:03:51 +0000 (20:03 +0000)]

Merge "Make battery labels translatable." into nyc-dev
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.

Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633

commit | commitdiff | tree

Sid Soundararajan [Mon, 23 May 2016 20:01:38 +0000 (20:01 +0000)]

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
am: 0513125c92

* commit '0513125c92789912214235faad26e7a97184a53a':
Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I617796ca2d7476801517587cf81f29f8edc93d2d

commit | commitdiff | tree

Sid Soundararajan [Mon, 23 May 2016 20:01:03 +0000 (20:01 +0000)]

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
am: 0513125c92

* commit '0513125c92789912214235faad26e7a97184a53a':
Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I057727feb949fc864c3396ef53f9fba331f65ba8

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 19:58:48 +0000 (19:58 +0000)]

Merge "Make battery labels translatable." into nyc-dev

commit | commitdiff | tree

Sid Soundararajan [Mon, 23 May 2016 19:56:42 +0000 (19:56 +0000)]

Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 19:54:31 +0000 (19:54 +0000)]

Merge "Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: 97cdd11f2a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Joe Onorato [Mon, 23 May 2016 19:54:10 +0000 (19:54 +0000)]

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971
am: c3db3e217f

* commit 'c3db3e217f397153e9982bb29e37fc28e01062d2':
Add data from /proc/pagetypeinfo to procstats.

Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786

commit | commitdiff | tree

Joe Onorato [Mon, 23 May 2016 19:54:10 +0000 (19:54 +0000)]

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971
am: 97cdd11f2a

* commit '97cdd11f2a46a9919a615436dd0ddeeb88945c61':
Add data from /proc/pagetypeinfo to procstats.

Change-Id: I19c639267c69783a975361f5aa5fae083e5eb695

commit | commitdiff | tree

Joe Onorato [Mon, 23 May 2016 19:50:45 +0000 (19:50 +0000)]

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
Add data from /proc/pagetypeinfo to procstats.

Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16

commit | commitdiff | tree

Joe Onorato [Mon, 23 May 2016 19:50:36 +0000 (19:50 +0000)]

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
Add data from /proc/pagetypeinfo to procstats.

Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8

commit | commitdiff | tree

TreeHugger Robot [Mon, 23 May 2016 19:46:48 +0000 (19:46 +0000)]

Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:43:55 +0000 (19:43 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214
am: 8a87d24e96

* commit '8a87d24e968e367c3f3878371f744ebc0a33b257':

Change-Id: Ieecb7d00d3f26ec371687ccaa855ec5e0b9358be

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 19:39:19 +0000 (19:39 +0000)]

Merge "Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: c91da73326" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:38:49 +0000 (19:38 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214
am: c91da73326

* commit 'c91da7332696afc6fc3594cb9e090c2897109f49':
Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I513c76ed5bf5e0a72aa7db1cdcf15043172d66de

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:38:31 +0000 (19:38 +0000)]

Merge "Fixed a flashing when the affordances were launched" into nyc-dev am: a56e732c01
am: bdfa6d9fcf

* commit 'bdfa6d9fcfbfeb2f792770c9a71f58cb0eb4d119':
Fixed a flashing when the affordances were launched

Change-Id: I99310a591fc9943b35bdc0436bcef6736cfe37cd

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:38:27 +0000 (19:38 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214
am: 71d7ca4e92

* commit '71d7ca4e92c5f4899797590467d8996ef2ae5884':
Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I16d09de65dc58d83d20eb7b8e6ddbc3480b118bf

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:34:16 +0000 (19:34 +0000)]

Merge "Fixed a flashing when the affordances were launched" into nyc-dev
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
Fixed a flashing when the affordances were launched

Change-Id: I0a03111befb2e5136aac2d07f1b07af4131aaf6c

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:34:12 +0000 (19:34 +0000)]

Merge "Fixed a flashing when the affordances were launched" into nyc-dev
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
Fixed a flashing when the affordances were launched

Change-Id: I142fde45dd14de96f58289a8aed1113d3bf8578a

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:34:12 +0000 (19:34 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
am: 7fc88ac214

* commit '7fc88ac2144a05f04a941d969f86f959a89916d8':
Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I82af9d5a47a63fff0bed8adaedc7a96647a54f19

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:34:08 +0000 (19:34 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
am: 7fc88ac214

* commit '7fc88ac2144a05f04a941d969f86f959a89916d8':
Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I630704c54dbe15652172d7d723e211568e021082

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 19:30:37 +0000 (19:30 +0000)]

Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 am: d4962867bd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:30:11 +0000 (19:30 +0000)]

Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8
am: d4962867bd

* commit 'd4962867bd0a01e102315720d0d0cce41af98202':
Fixed a crash with the autocancelling

Change-Id: I031b0c3ca48f93a4705d8dfd58c7b263e1e1953d

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:29:34 +0000 (19:29 +0000)]

Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8
am: 45df222972

* commit '45df22297219fe2d3d685e5046b39d76127ec45b':
Fixed a crash with the autocancelling

Change-Id: Ia1d1f6fac5e056878037b706122d99a491f5b5c1

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:26:22 +0000 (19:26 +0000)]

Merge "Fixed a flashing when the affordances were launched" into nyc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:26:01 +0000 (19:26 +0000)]

Merge "Fixed a crash with the autocancelling" into nyc-dev
am: 4a4b76f6e8

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
Fixed a crash with the autocancelling

Change-Id: I89e6a7e66166f81bc44ce8c6e5cf3c21e06693cc

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:25:55 +0000 (19:25 +0000)]

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 23 May 2016 19:25:51 +0000 (19:25 +0000)]

Merge "Fixed a crash with the autocancelling" into nyc-dev
am: 4a4b76f6e8

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
Fixed a crash with the autocancelling

Change-Id: I09e52b5ac392edaae7f42c7cb1903f60421b03bc

commit | commitdiff | tree

TreeHugger Robot [Mon, 23 May 2016 19:21:56 +0000 (19:21 +0000)]

Merge "Fixed a crash with the autocancelling" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 19:12:10 +0000 (19:12 +0000)]

Merge "Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102 am: 9eef46b66f" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Mon, 23 May 2016 19:11:45 +0000 (19:11 +0000)]

Merge "Don\'t include removed window when counting interesting windows" into nyc-dev am: 18ef543102
am: 9eef46b66f

* commit '9eef46b66f0265ce7d851216c6662fcbbca8783a':
Don't include removed window when counting interesting windows

Change-Id: Ie8b8dec30cd6aa9e51d1e11d4b80293bc27340e6

commit | commitdiff | tree

Chris Wren [Mon, 23 May 2016 19:10:57 +0000 (19:10 +0000)]

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: 9ab291e20e

* commit '9ab291e20eb8979f58dcd086cfa659252767b25f':
Don't include removed window when counting interesting windows

Change-Id: I4a45f4068b6ad5328d34ede02fd5bc078dff27d7

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 19:08:04 +0000 (19:08 +0000)]

Merge "Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: 4da0296e23" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Mon, 23 May 2016 19:08:04 +0000 (19:08 +0000)]

Merge "Don\'t include removed window when counting interesting windows" into nyc-dev
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
Don't include removed window when counting interesting windows

Change-Id: Iea9bc7a6c2ae5043aaea6b9d48fbb1dfd49d5fc7

commit | commitdiff | tree

Chong Zhang [Mon, 23 May 2016 19:08:00 +0000 (19:08 +0000)]

Merge "Don\'t include removed window when counting interesting windows" into nyc-dev
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
Don't include removed window when counting interesting windows

Change-Id: I3c2202e3928720161dbce8d1b4cfa0f16f83179f

commit | commitdiff | tree

Chris Wren [Mon, 23 May 2016 19:07:33 +0000 (19:07 +0000)]

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: 4da0296e23

* commit '4da0296e236047aef095473ffe4105b41df0c6c0':
Don't throw RemoteException from new NLS APIs

Change-Id: Ie0e38bfa1447ca4a5767274d23a3a82dfffef1e5

commit | commitdiff | tree

Chris Wren [Mon, 23 May 2016 19:07:27 +0000 (19:07 +0000)]

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: ec2e36a485

* commit 'ec2e36a4851780219e342c545467fb433ef16fd6':
Don't throw RemoteException from new NLS APIs

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd

commit | commitdiff | tree

Chris Wren [Mon, 23 May 2016 19:01:27 +0000 (19:01 +0000)]

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378

commit | commitdiff | tree

Chris Wren [Mon, 23 May 2016 19:01:21 +0000 (19:01 +0000)]

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e

commit | commitdiff | tree

Chong Zhang [Mon, 23 May 2016 18:59:03 +0000 (18:59 +0000)]

Merge "Don't include removed window when counting interesting windows" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 18:54:22 +0000 (18:54 +0000)]

Merge "Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d am: a3e767a73d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Mon, 23 May 2016 18:54:17 +0000 (18:54 +0000)]

Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev

commit | commitdiff | tree

Victor Chang [Mon, 23 May 2016 18:53:52 +0000 (18:53 +0000)]

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d
am: a3e767a73d

* commit 'a3e767a73db5e09d6d178aeb058cebf62fa89142':
Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I04f8efec1519104066f4e49811c24983f5e995c1

commit | commitdiff | tree

Victor Chang [Mon, 23 May 2016 18:53:44 +0000 (18:53 +0000)]

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d
am: b3e08e0363

* commit 'b3e08e03636cc18b2ec54ba095437fa444735586':
Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: Iaa6fdd448d930151bcae7fdf50cc993a10885cb0

commit | commitdiff | tree

Victor Chang [Mon, 23 May 2016 18:49:23 +0000 (18:49 +0000)]

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I49885b9bffb4c16f52f7ed471b1019dfb7fe85f4

commit | commitdiff | tree

Victor Chang [Mon, 23 May 2016 18:49:16 +0000 (18:49 +0000)]

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: If3e915aa66d29f70c217b3231937730c63f7e9eb

commit | commitdiff | tree

Chong Zhang [Sat, 21 May 2016 16:23:55 +0000 (09:23 -0700)]

Don't include removed window when counting interesting windows

Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.

bug: 28797800

Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd

commit | commitdiff | tree

Philip P. Moltmann [Mon, 23 May 2016 18:45:20 +0000 (18:45 +0000)]

Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a
am: 7ca655ea0a

* commit '7ca655ea0a6c076ea28bb42fd8ea141e67e54fd7':

Change-Id: I90564fc9ea83140aeb3ad9eb56f8e8a9ac176b0a

commit | commitdiff | tree

Philip P. Moltmann [Mon, 23 May 2016 18:42:24 +0000 (18:42 +0000)]

Merge "Correct height of add printer list separator" into nyc-dev am: 80c18bcc3a
am: 4a3b323d3c

* commit '4a3b323d3ca55ce93176dfc1c258dee5fb29d04b':
Correct height of add printer list separator

Change-Id: I52c568fcb16c1e06e8d371224b539ba524b3e1b8

commit | commitdiff | tree

Jason Monk [Mon, 23 May 2016 18:42:23 +0000 (14:42 -0400)]

Make battery labels translatable.

Bug: 28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc

commit | commitdiff | tree

Victor Chang [Mon, 23 May 2016 18:42:08 +0000 (18:42 +0000)]

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev

commit | commitdiff | tree

Philip P. Moltmann [Mon, 23 May 2016 18:38:36 +0000 (18:38 +0000)]

Merge "Correct height of add printer list separator" into nyc-dev
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
Correct height of add printer list separator

Change-Id: I3cfdf14bc4e72b727f6469f99f950794e667ce33

commit | commitdiff | tree

Philip P. Moltmann [Mon, 23 May 2016 18:37:47 +0000 (18:37 +0000)]

Merge "Correct height of add printer list separator" into nyc-dev
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
Correct height of add printer list separator

Change-Id: Ib3b93ec7f2bd12b077353b3ac3f671a68bf97d34

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 23 May 2016 18:36:20 +0000 (18:36 +0000)]

Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Winson [Mon, 23 May 2016 18:35:53 +0000 (18:35 +0000)]

Removing extra haptic feedback. am: 7660bca509
am: 60c32b1f15

* commit '60c32b1f15648930301ec289d79263a60ee9c985':
Removing extra haptic feedback.

Change-Id: Iac885071d8978e11389a5f5c3d625fcb7ab8a887

commit | commitdiff | tree

Winson [Mon, 23 May 2016 18:35:44 +0000 (18:35 +0000)]

Removing extra haptic feedback. am: 7660bca509
am: db7ef9378a

* commit 'db7ef9378aee89c5840a70d83ad964f0f727932f':
Removing extra haptic feedback.

Change-Id: Ib31641e25bd88a5c5e60dbb6058179743303a639

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.