Geoff Mendal
6b129a1e09
Import translations. DO NOT MERGE
...
Change-Id: I3b8c2defeead0f1a68f261eaa271e7a316130627
Auto-generated-cl: translation import
2015-10-26 11:53:50 -05:00
Geoff Mendal
6995e0bf08
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
am: 14bb0511c6 -s ours
* commit '14bb0511c6cc5ad62a870b3c2437c8090bcf75af':
Import translations. DO NOT MERGE
2015-10-26 16:33:36 +00:00
Geoff Mendal
14bb0511c6
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-10-26 16:28:12 +00:00
Geoff Mendal
7afd89dfbb
Import translations. DO NOT MERGE
...
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
2015-10-26 11:27:14 -05:00
Geoff Mendal
432eb8e686
Import translations. DO NOT MERGE
...
am: f6fc9e2152 -s ours
* commit 'f6fc9e215292945ef3add558e513e5eef01acbfe':
Import translations. DO NOT MERGE
2015-10-26 14:31:12 +00:00
Geoff Mendal
f6fc9e2152
Import translations. DO NOT MERGE
...
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
2015-10-26 07:17:06 -07:00
Geoff Mendal
a1ecb9ee2b
Import translations. DO NOT MERGE
...
Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import
2015-10-26 05:11:27 -07:00
Bryce Lee
c2f421a869
Add Telecom config bool to require a phone account to be present for handle
...
Bug: 25202039
Change-Id: I83f6a72ed78fd22bddc7be46d24af33781a65f6e
2015-10-25 22:27:10 -07:00
Puneet Kumar
fc12c7c1b7
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
...
am: ca9c43b27b
* commit 'ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
Prevent recents from coming up when in SUW
2015-10-24 15:42:33 +00:00
Puneet Kumar
ca9c43b27b
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
2015-10-24 15:20:28 +00:00
Michael Wright
d847ad5555
Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
2015-10-24 13:24:15 +01:00
Dan Sandler
06eb98c04d
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509
...
am: 493272c8a7
* commit '493272c8a7e7219f947a222cd71aaaf3d4bc3c0a':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:58:58 +00:00
Dan Sandler
493272c8a7
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours
...
am: e68e70d509
* commit 'e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:45:01 +00:00
Dan Sandler
e68e70d509
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b
...
am: 7e16b2e8f5 -s ours
* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:33:48 +00:00
Dan Sandler
e41b3b35b5
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b
...
am: d9a96ff747
* commit 'd9a96ff7475a85ed60b42f96115db634e8c313cf':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:33:33 +00:00
Dan Sandler
7e16b2e8f5
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b
...
am: 511357c39b
* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:15:49 +00:00
Dan Sandler
d9a96ff747
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours
...
am: ab4857790b
* commit 'ab4857790bc84388817c0bec8c4010d660f35ada':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:15:44 +00:00
Dan Sandler
ab4857790b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
...
am: 6c3186ea07 -s ours
* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:17 +00:00
Dan Sandler
511357c39b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours
...
am: 410bea181b
* commit '410bea181b229adef7a2c1a9308379eead260706':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
...
am: 6026b5b17e
* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
...
am: b1de85487a -s ours
* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:54 +00:00
Dan Sandler
5da8453866
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7
...
am: 4db8c18755
* commit '4db8c187551bd238b50a85a7be3be6595a69a2ed':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:43 +00:00
Dan Sandler
6026b5b17e
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 51c2619c77
* commit '51c2619c7706575a171cf29819db14e91b815a62':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:50 +00:00
Dan Sandler
4db8c18755
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 446dcc9ed7
* commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:39 +00:00
Dan Sandler
b1de85487a
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 1044e162c3
* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:22 +00:00
Ching Tzung Lin
f6e4c9da5f
Consolidates config_windowOutsetBottom and circular_display_mask_offset
...
Three phases involved:
phase 1: change all code references to circurlar_display_mask_offset to
config_windowOutsetBottom, and mark circular_display_mask_offset
deprecated.
phase 2: remove circular_display_mask_offset from device overlays
phase 3: remove circular_display_mask_offset symbol and default setting.
Bug:25220421
Change-Id: Ia3f77610dbbb964eb58c6b28f6206799d56c44c2
2015-10-23 15:49:52 -07:00
xin He
910e447d96
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
...
am: 3b47afe765
* commit '3b47afe7656eb16e8ddb04d771a18eab678c125f':
[DO NOT MERGE] EAP-TLS PMKID mismatch error
2015-10-23 20:53:48 +00:00
Bryce Lee
434a1fd687
Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev
2015-10-23 20:52:44 +00:00
xin He
3b47afe765
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
2015-10-23 20:45:24 +00:00
xinhe
2452e54de6
[DO NOT MERGE] EAP-TLS PMKID mismatch error
...
b/24253154
Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
2015-10-23 12:56:25 -07:00
Bryce Lee
c17bbe0be2
Add config flag for reloading supported profiles in bluetooth on enable.
...
Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
2015-10-23 12:32:07 -07:00
Ching Tzung Lin
e94b3ba099
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev
2015-10-23 18:05:52 +00:00
Adrian Roos
a53bbb652b
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
...
am: 93a6b4c129
* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
93a6b4c129
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
2015-10-23 17:21:23 +00:00
Dianne Hackborn
9161871f83
Merge "DO NOT MERGE Fix issue #24118803 : The screen doesn\'t turn off..." into mnc-dr-dev
...
am: b32e020d23
* commit 'b32e020d237cfd94cdfe8c589900a899dc14413a':
DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off...
2015-10-23 17:09:45 +00:00
Dianne Hackborn
b32e020d23
Merge "DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off..." into mnc-dr-dev
2015-10-23 17:04:55 +00:00
Sungmin Choi
af745653d0
Remove tether_apndata for Sasktel
...
am: a665ea7207
* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
Remove tether_apndata for Sasktel
2015-10-23 03:26:18 +00:00
Dan Sandler
1044e162c3
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
2015-10-23 01:37:52 +00:00
Adrian Roos
0450565d9a
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Dianne Hackborn
7730cd2740
DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off...
...
...after more than 60 minutes left
The sensing timeout alarm was being cancelled immediately after it
was scheduled it. Now only cancel it when we are done sensing or
have reset activity.
Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af
2015-10-22 17:40:23 -07:00
Sungmin Choi
a665ea7207
Remove tether_apndata for Sasktel
...
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).
BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
2015-10-22 16:59:44 -07:00
Ian Pedowitz
b402735fc0
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
...
am: 09fd4ecf90
* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
2015-10-22 22:26:32 +00:00
Ching Tzung Lin
9c57af4c5a
Factor chin size into dimension checking to determine if
...
CircularDisplayMask can be turned on.
Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a
2015-10-22 15:14:48 -07:00
Ian Pedowitz
e2adb2cf0f
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Nicolas Prévot
f31628f58b
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
...
am: 6666b29cf7
* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
Don't resolve cross-profile app links without intent picker.
2015-10-22 20:35:19 +00:00
Nicolas Prévot
6666b29cf7
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
2015-10-22 20:29:51 +00:00
Dmitry Torokhov
d3eee7c410
SystemUI: fix automatic pairing of BT keyboards
...
am: 79f00cf06f
* commit '79f00cf06f5e70047d73b48d20910b967353b075':
SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:13:36 +00:00
