OSDN Git Service
Paul Jensen [Tue, 3 Feb 2015 21:17:09 +0000 (21:17 +0000)]
am
f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge:
39ae054
* commit '
f1b78d046965f91c2e03d541cba4c91ea707111a':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
automerge:
39ae054
* commit '
39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
Facilitate network validation on networks with a per-network PAC.
Paul Jensen [Tue, 3 Feb 2015 21:08:58 +0000 (21:08 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Craig Mautner [Tue, 3 Feb 2015 18:48:29 +0000 (18:48 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock" automerge:
53e8d6f
automerge:
6112f63
* commit '
6112f63369c7ba463c0384c73a4e4c0d45b63918':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:43:46 +0000 (18:43 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
automerge:
53e8d6f
* commit '
53e8d6f934be403b9c7733c190b6052d60dd0658':
[ActivityManager] Prevent application holding AMS lock
Craig Mautner [Tue, 3 Feb 2015 18:41:12 +0000 (18:41 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"
Craig Mautner [Tue, 3 Feb 2015 18:04:32 +0000 (18:04 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
automerge:
7d1aded
* commit '
7d1adede2fbea8f4c0ad92214bee16395498dd07':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 18:00:46 +0000 (18:00 +0000)]
am
240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
* commit '
240e8743977d1a1e7a43ff42e0d52148db10cda8':
[ActivityManager] Set appropriate relation of task to home
Craig Mautner [Tue, 3 Feb 2015 17:54:25 +0000 (17:54 +0000)]
Merge "[ActivityManager] Set appropriate relation of task to home"
Craig Mautner [Tue, 3 Feb 2015 17:46:56 +0000 (17:46 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge:
84533ed
automerge:
11c6f8b
* commit '
11c6f8b7c3cc51a3a44bca5003ac3fb56a410c33':
Remove fall through for KEYCODE_VOICE_ASSIST
Craig Mautner [Tue, 3 Feb 2015 17:41:31 +0000 (17:41 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
automerge:
84533ed
* commit '
84533edfc081f8dfa632ee1e49947b3d42f8a27d':
Remove fall through for KEYCODE_VOICE_ASSIST
Craig Mautner [Tue, 3 Feb 2015 17:36:54 +0000 (17:36 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
Robert Greenwalt [Tue, 3 Feb 2015 16:53:49 +0000 (16:53 +0000)]
am
10d1609b: am
deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
* commit '
10d1609be9bd842f9a3ee44d9753a55e6e19cbd8':
Deutsche Telekom VVM free SMS shortcodes DE
Robert Greenwalt [Tue, 3 Feb 2015 16:47:34 +0000 (16:47 +0000)]
am
deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
* commit '
deef702e60f2f0aa9cf35a70bdf4c5e582799750':
Deutsche Telekom VVM free SMS shortcodes DE
Robert Greenwalt [Tue, 3 Feb 2015 16:44:01 +0000 (16:44 +0000)]
Merge "Deutsche Telekom VVM free SMS shortcodes DE"
Paul Jensen [Mon, 2 Feb 2015 16:03:03 +0000 (11:03 -0500)]
Facilitate network validation on networks with a per-network PAC.
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY. This will fail on networks where Internet
access is only permitted via the proxy. Always failing network
validation has the potential to disable WiFi auto-join. Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.
bug:
19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
Henrik Baard [Tue, 3 Feb 2015 08:25:28 +0000 (09:25 +0100)]
Remove fall through for KEYCODE_VOICE_ASSIST
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.
The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.
Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
Svetoslav [Tue, 3 Feb 2015 07:27:33 +0000 (07:27 +0000)]
Fix broken activation of the selected view in accessibility mode. automerge:
ded133c
automerge:
b6b526e
* commit '
b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
Fix broken activation of the selected view in accessibility mode.
Svetoslav [Tue, 3 Feb 2015 07:20:34 +0000 (07:20 +0000)]
Fix broken activation of the selected view in accessibility mode.
automerge:
ded133c
* commit '
ded133c446fa9d0d23e6bde19a66fb2ce3980491':
Fix broken activation of the selected view in accessibility mode.
Yang Ni [Tue, 3 Feb 2015 06:27:39 +0000 (06:27 +0000)]
Merge "Pass in code cache directory when creating a script group." automerge:
9559ce7
automerge:
29fe5ef
* commit '
29fe5ef179a4a7de15360650353c6196f9350b07':
Pass in code cache directory when creating a script group.
Yang Ni [Tue, 3 Feb 2015 06:22:55 +0000 (06:22 +0000)]
Merge "Pass in code cache directory when creating a script group."
automerge:
9559ce7
* commit '
9559ce7c1bd4451a470d6e1542659e726b0dce3d':
Pass in code cache directory when creating a script group.
Yang Ni [Tue, 3 Feb 2015 06:20:19 +0000 (06:20 +0000)]
Merge "Pass in code cache directory when creating a script group."
Svetoslav [Sat, 31 Jan 2015 04:28:41 +0000 (20:28 -0800)]
Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.
This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.
The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.
bug:
18986806
bug:
18889611
Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
Joe Fernandez [Mon, 2 Feb 2015 20:29:31 +0000 (20:29 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
automerge:
d99924d
* commit '
d99924d556b95bc05bbff9408519e301983193fb':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 19:35:00 +0000 (19:35 +0000)]
am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
* commit '
175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:30:34 +0000 (19:30 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
automerge:
2ffb340
* commit '
2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
Send accessibility event when bouncer is shown
Jorim Jaggi [Mon, 2 Feb 2015 19:25:34 +0000 (19:25 +0000)]
am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
* commit '
515148dcaaf5b63e69998d67958829d4347071ec':
Send accessibility event when bouncer is shown
Joe Fernandez [Mon, 2 Feb 2015 19:24:38 +0000 (19:24 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
automerge:
c6ca860
* commit '
c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:19:23 +0000 (19:19 +0000)]
Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Jorim Jaggi [Mon, 2 Feb 2015 13:45:39 +0000 (14:45 +0100)]
Send accessibility event when bouncer is shown
Bug:
18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
Joe Fernandez [Mon, 2 Feb 2015 17:44:26 +0000 (17:44 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
* commit '
d14b64323ff92be9db804d66a1146693c27150a6':
docs: February 2015 Dashboard updates
Robert Greenwalt [Mon, 2 Feb 2015 17:29:21 +0000 (17:29 +0000)]
am
0cdd4560: am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
0cdd4560dac5784dda169863eb844d489bdc79d5':
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Robert Greenwalt [Mon, 2 Feb 2015 17:16:32 +0000 (17:16 +0000)]
am
fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '
fabf0e0ba84e0cd28f459360b20386e68179cc31':
Robert Greenwalt [Mon, 2 Feb 2015 17:00:42 +0000 (17:00 +0000)]
Merge "Fixing up the formatting code which is already merged"
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Tyler Gunn [Mon, 2 Feb 2015 16:00:12 +0000 (16:00 +0000)]
am
235f60bc: am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '
235f60bc134646d1ce18ab872b982ff63b14845e':
Fixing conference merge where only one party is added to conference.
Tyler Gunn [Mon, 2 Feb 2015 15:53:00 +0000 (15:53 +0000)]
am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '
4143b796bc20072a12fe31cbfdf4f1918dff0728':
Fixing conference merge where only one party is added to conference.
Tyler Gunn [Mon, 2 Feb 2015 15:48:52 +0000 (15:48 +0000)]
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
Geoff Mendal [Mon, 2 Feb 2015 15:30:25 +0000 (15:30 +0000)]
am
c6fc5287: (-s ours) Import translations. DO NOT MERGE
* commit '
c6fc5287138744a4684a837c883dedde14359612':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 14:39:50 +0000 (08:39 -0600)]
Import translations. DO NOT MERGE
Change-Id: I1151a10a47c8545c3db3445a2cdbe6edffa6c177
Auto-generated-cl: translation import
Robert Greenwalt [Wed, 21 Jan 2015 19:52:20 +0000 (19:52 +0000)]
Fixing up the formatting code which is already merged
I just apply google coding guide like space.
Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"
This code is about + plus number converting logic for international NANP.
Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
Jon Larimer [Sat, 31 Jan 2015 05:44:27 +0000 (05:44 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635 automerge:
dcce25a
automerge:
4f78e0b
* commit '
4f78e0b1e849193f5e70447171b4f30ad0aee700':
Jon Larimer [Sat, 31 Jan 2015 05:27:30 +0000 (05:27 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635
automerge:
dcce25a
* commit '
dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
Jon Larimer [Sat, 31 Jan 2015 05:19:19 +0000 (05:19 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a
automerge:
4a82635
* commit '
4a826358e769e697ec329cf14edeb049981a11a9':
Jon Larimer [Sat, 31 Jan 2015 05:03:24 +0000 (05:03 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af
automerge:
27d099a
* commit '
27d099a7e128744b7a11ce09b469a3396e872d33':
Joe Fernandez [Sat, 31 Jan 2015 04:20:19 +0000 (04:20 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da automerge:
346a9a2
automerge:
f4b2bd4
* commit '
f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 04:18:58 +0000 (04:18 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447 automerge:
580937f
automerge:
c053438
* commit '
c05343828611ed0b82fae4edf7fe11e0e9087db1':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 04:17:35 +0000 (04:17 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd automerge:
1575ca6
automerge:
862cdd6
* commit '
862cdd6f11490c060842599a58a400e284c937d9':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 04:01:11 +0000 (04:01 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da
automerge:
346a9a2
* commit '
346a9a2f364f7cdabf06944014594b299d384082':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:59:37 +0000 (03:59 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447
automerge:
580937f
* commit '
580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:58:26 +0000 (03:58 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd
automerge:
1575ca6
* commit '
1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
Resource resolution fixes.
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de
automerge:
9e7e8af
* commit '
9e7e8afbb934742cb7996b22e32f94c1c09704af':
Joe Fernandez [Sat, 31 Jan 2015 03:04:16 +0000 (03:04 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9
automerge:
cacf7da
* commit '
cacf7da1c4d078641f099bab717e155609c5dc99':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:02:42 +0000 (03:02 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge:
7789447
* commit '
7789447bd97c851b7a09623a417300590e5439d5':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:01:20 +0000 (03:01 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge:
7e683bd
* commit '
7e683bdaddff77a24a36d420c5782b47795c5ccb':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 02:50:57 +0000 (02:50 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
automerge:
f02a8d9
* commit '
f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '
1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:10 +0000 (00:54 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '
3d5535cfb7755c20619529649b025c4682013b85':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:07 +0000 (00:54 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '
1d59871e4e8a3a657dab3931d684706c45630a2f':
Resource resolution fixes.
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev
Joe Fernandez [Sat, 31 Jan 2015 00:29:37 +0000 (00:29 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge:
3548de6
automerge:
95fa882
* commit '
95fa88250a1957c7adfbd35d52f62e42cbe03df6':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:25:04 +0000 (00:25 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
automerge:
3548de6
* commit '
3548de60735a79d3e7087c26ae491a7f38da5b4d':
docs: studio emulator platform update
Joe Fernandez [Sat, 31 Jan 2015 00:14:39 +0000 (00:14 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
5c9d0de
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Joe Fernandez [Fri, 30 Jan 2015 23:41:10 +0000 (23:41 +0000)]
am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
d801a1238392b8c7a8e0131cee89370143363046':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Jon Larimer [Fri, 30 Jan 2015 22:40:17 +0000 (22:40 +0000)]
am
3a6d8f54: am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:33:13 +0000 (22:33 +0000)]
am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
90d5bd8daab404afc50470f5c19ea725bd2466fe':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:24:43 +0000 (22:24 +0000)]
am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:24:25 +0000 (22:24 +0000)]
am
712d5b3d: am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '
712d5b3d582dfe8f7fb855ba98704c98e9441836':
[DS] Correct the access method for telephony system property
Jon Larimer [Fri, 30 Jan 2015 22:18:34 +0000 (22:18 +0000)]
am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:17:42 +0000 (22:17 +0000)]
am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '
147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
[DS] Correct the access method for telephony system property
Jinsuk Kim [Fri, 30 Jan 2015 22:15:00 +0000 (22:15 +0000)]
am
42e785fb: am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '
42e785fbf7dfa50096275cf1e6233247e9fc15f7':
Revert "CEC: Let playback device switch TV input after bootup"
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:09:37 +0000 (22:09 +0000)]
Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 22:06:09 +0000 (22:06 +0000)]
am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '
3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
Revert "CEC: Let playback device switch TV input after bootup"
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jinsuk Kim [Fri, 30 Jan 2015 22:00:39 +0000 (22:00 +0000)]
Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 21:58:18 +0000 (21:58 +0000)]
Revert "CEC: Let playback device switch TV input after bootup"
This reverts commit
8913a0e1e8559d96e82b1ff408dd312ed279021b.
Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Jason Monk [Fri, 30 Jan 2015 19:27:06 +0000 (19:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge:
b2dd5cb
automerge:
d2f15ec
* commit '
d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 19:25:20 +0000 (19:25 +0000)]
Fix expandSettingsPanel status bar call automerge:
3c68ca2
automerge:
f388249
* commit '
f38824928cf586124ffc6dc7a85c7f8603f77c5a':
Fix expandSettingsPanel status bar call
Jason Monk [Fri, 30 Jan 2015 18:48:15 +0000 (18:48 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
automerge:
b2dd5cb
* commit '
b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
Fix QS bluetooth tile accessibility issue
Jason Monk [Fri, 30 Jan 2015 18:46:31 +0000 (18:46 +0000)]
Fix expandSettingsPanel status bar call
automerge:
3c68ca2
* commit '
3c68ca2feab6d3cd09c297ddc2e77af67694feec':
Fix expandSettingsPanel status bar call
Jason Monk [Fri, 30 Jan 2015 18:27:52 +0000 (18:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Jason Monk [Fri, 30 Jan 2015 18:02:27 +0000 (13:02 -0500)]
Fix QS bluetooth tile accessibility issue
Bluetooth tile was not announcing its state when the top half was
clicked. This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information. So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.
Bug:
19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
Jason Monk [Fri, 30 Jan 2015 16:30:29 +0000 (11:30 -0500)]
Fix expandSettingsPanel status bar call
Use the same mechanism as the two finger gesture to get it to open
correctly.
Bug:
19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
Lorenzo Colitti [Fri, 30 Jan 2015 15:56:00 +0000 (15:56 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration." automerge:
c565a56
automerge:
5b392ee
* commit '
5b392ee7584688d6929ca40760d0df2a12bd0b16':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 15:54:45 +0000 (15:54 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge:
fba459d
automerge:
786deba
* commit '
786deba636618fcf530e42340b0e5d683c5af74c':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 12:15:39 +0000 (12:15 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
automerge:
c565a56
* commit '
c565a5675ac33d97d5c1caed7a5629412997fb4a':
Also include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Fri, 30 Jan 2015 12:13:38 +0000 (12:13 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
automerge:
fba459d
* commit '
fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Lorenzo Colitti [Fri, 30 Jan 2015 07:07:48 +0000 (07:07 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."
OSDN Git Service
