OSDN Git Service
Selim Cinek [Wed, 2 Aug 2017 17:36:03 +0000 (17:36 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am:
7a719ab0ed
am:
83aa001adf
Change-Id: Id8399a6fed722da7057c21e23981bc6925d72e7d
Android Build Merger (Role) [Wed, 2 Aug 2017 17:32:08 +0000 (17:32 +0000)]
Merge "Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp am:
a4fb234a4c" into oc-mr1-dev-plus-aosp
Dake Gu [Wed, 2 Aug 2017 17:27:53 +0000 (17:27 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
am:
8eb3a3979f
Change-Id: I85950ec6275c2d10bd0e9b7f030fa5ce2c66130c
Selim Cinek [Wed, 2 Aug 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am:
7a719ab0ed
Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54
Sundong Ahn [Wed, 2 Aug 2017 17:27:38 +0000 (17:27 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
am:
a4fb234a4c
Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25
Steven Moreland [Wed, 2 Aug 2017 17:23:53 +0000 (17:23 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
am:
3750937e70
Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea
Dake Gu [Wed, 2 Aug 2017 17:18:00 +0000 (17:18 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 2 Aug 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7
am:
2785be7572
Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
Stan Iliev [Wed, 2 Aug 2017 17:10:57 +0000 (17:10 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec am:
fb3f29b608
am:
ccd3121379
Change-Id: I4f96e688549840198dee57cd85c4362d23e564d8
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612
am:
811027ede7
Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec
am:
fb3f29b608
Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am:
49e2a9a612
Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad
am:
98eaf41eec
Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am:
8c9e5c81ad
Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Android Build Merger (Role) [Wed, 2 Aug 2017 16:22:16 +0000 (16:22 +0000)]
Merge "Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp am:
e3e338ed08" into oc-mr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:20:40 +0000 (16:20 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp
am:
e3e338ed08
Change-Id: Id8f0b1623ed9b268d3cd45521a5e9965b8e3feeb
Android Build Merger (Role) [Wed, 2 Aug 2017 16:20:03 +0000 (16:20 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778 am:
23123ece60" into oc-mr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:17:40 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778
am:
23123ece60
Change-Id: I57fc9c13849c9e8ed8960fddbac888a19ad40924
Felipe Leme [Wed, 2 Aug 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778
am:
d25050e2a4
Change-Id: I46463fe043ce8e008a4587bba80c2a48c029fed9
Android Build Merger (Role) [Wed, 2 Aug 2017 16:11:30 +0000 (16:11 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:09:58 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
6f9f17475d
Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607
Felipe Leme [Wed, 2 Aug 2017 16:09:20 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
32d4e30778
Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b
Felipe Leme [Wed, 2 Aug 2017 16:09:13 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
32d4e30778
Change-Id: I8de50b81273e89298a6276d8b17100c90361380e
Felipe Leme [Wed, 2 Aug 2017 16:00:41 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be
Felipe Leme [Wed, 2 Aug 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
Steven Moreland [Wed, 2 Aug 2017 15:38:40 +0000 (15:38 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944 am:
81972a18e4
am:
795bcc5b75
Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a
Bill Yi [Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e5ae77c679 -s ours
Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd
Steven Moreland [Wed, 2 Aug 2017 15:30:37 +0000 (15:30 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944
am:
81972a18e4
Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0
Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am:
7d7c269944
Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d
TreeHugger Robot [Wed, 2 Aug 2017 15:20:57 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
am:
a3735dc42e
Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7
TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
Bill Yi [Wed, 2 Aug 2017 15:04:55 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9f38e0f5e7 -s ours
Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa
Todd Kennedy [Wed, 2 Aug 2017 14:59:19 +0000 (14:59 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 14:49:10 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours
am:
5a4b06803d -s ours
Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b
Bill Yi [Wed, 2 Aug 2017 14:41:02 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9ce641fd81 -s ours
am:
0c411c32cd -s ours
Change-Id: Icb98d17a57ee254b3a5d3df7b4eee7332e14c35f
Bill Yi [Wed, 2 Aug 2017 14:36:03 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9ce641fd81 -s ours
Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4
Bill Yi [Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9ce641fd81 -s ours
Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4
Todd Kennedy [Wed, 2 Aug 2017 14:33:09 +0000 (14:33 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
am:
5e049eb884
Change-Id: I27542404b197a9d11d611d95f271660856271d40
TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Todd Kennedy [Wed, 2 Aug 2017 14:23:16 +0000 (14:23 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 12:34:29 +0000 (12:34 +0000)]
Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8 am:
cf538b382a" into oc-mr1-dev-plus-aosp
Jorim Jaggi [Wed, 2 Aug 2017 12:32:27 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8
am:
cf538b382a
Change-Id: Ia7c5f062b34475630817fefe5fc7ab68f4e0cdaf
Jorim Jaggi [Wed, 2 Aug 2017 12:32:24 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am:
612de053b8
am:
7269de217e
Change-Id: I1b5517489afa3da6c767bea99122a7c7fa05c3a1
Jorim Jaggi [Wed, 2 Aug 2017 12:23:06 +0000 (12:23 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am:
612de053b8
Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3
Jorim Jaggi [Wed, 2 Aug 2017 12:22:58 +0000 (12:22 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am:
612de053b8
Change-Id: I687dad0a2177c8235e0a2acfd574a92a2a5cd6bb
Jorim Jaggi [Wed, 2 Aug 2017 12:15:40 +0000 (12:15 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 07:57:25 +0000 (00:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d58d6708464b7254857c5fca1680bbf4f0212b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 2 Aug 2017 07:37:29 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic83f9d7c74d8562b3d2637b6aca331ad7e3b2f0a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Tomoharu Hatano [Wed, 2 Aug 2017 06:08:07 +0000 (06:08 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
am:
5af90f9fc6
Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5
TreeHugger Robot [Wed, 2 Aug 2017 06:01:04 +0000 (06:01 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
Jonathan Basseri [Wed, 2 Aug 2017 02:37:46 +0000 (02:37 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39 am:
0fed7e3282
am:
96bfbcdcd4
Change-Id: I918dc3e55ca50416d6a92341e1f8b8eef33415fd
Jonathan Basseri [Wed, 2 Aug 2017 02:27:55 +0000 (02:27 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39
am:
0fed7e3282
Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
Felipe Leme [Wed, 2 Aug 2017 02:10:35 +0000 (02:10 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
e971d933be
am:
35120d33fe -s ours
Change-Id: I3a921cd3ad150516480c181e305edeb0747ac922
Jonathan Basseri [Wed, 2 Aug 2017 02:07:20 +0000 (02:07 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6 am:
aaeca1e977
am:
89a2a41572
Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6
Jonathan Basseri [Wed, 2 Aug 2017 02:06:55 +0000 (02:06 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7
am:
7728849a39
Change-Id: Id7f000e7a67c53c8c3d26482a7d1697255943bf7
Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am:
85a215bae7
Change-Id: I30dddd90e5984519219865752f563a45962be593
Felipe Leme [Wed, 2 Aug 2017 01:57:16 +0000 (01:57 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
e971d933be
Change-Id: Id05a08413742ef94a426738fd0e82243c0553942
Jonathan Basseri [Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6
am:
aaeca1e977
Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
Felipe Leme [Wed, 2 Aug 2017 01:00:22 +0000 (01:00 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours" into oc-mr1-dev
am:
0a0bc5f89d -s ours
Change-Id: I9285c5fd38a0ecd532e69d20baa29e54e18ec93e
Phil Weaver [Wed, 2 Aug 2017 00:55:44 +0000 (00:55 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
am:
cdb70789d7
Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e
Felipe Leme [Wed, 2 Aug 2017 00:51:45 +0000 (00:51 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours
am:
dd187f4a82 -s ours
Change-Id: I66774912fda7acd0259644b45c40fd8d94086626
Android Build Merger (Role) [Wed, 2 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2 -s ours" into oc-mr1-dev
Felipe Leme [Wed, 2 Aug 2017 00:44:17 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace am:
27eb322ed2
am:
4e051d9da9 -s ours
Change-Id: I31751578bdf17a66f0abae25375b14ce22a8cddb
Felipe Leme [Wed, 2 Aug 2017 00:44:00 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2 -s ours
Change-Id: I44079cc5dec0f7c513370ae9effdcd93180da38c
TreeHugger Robot [Wed, 2 Aug 2017 00:43:41 +0000 (00:43 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
Felipe Leme [Wed, 2 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2 -s ours
Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a
Felipe Leme [Wed, 2 Aug 2017 00:35:44 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2
Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16
Felipe Leme [Wed, 2 Aug 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab
Felipe Leme [Wed, 2 Aug 2017 00:26:37 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).
Bug:
36376126
Test: boot marlin device
Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463
Bill Yi [Tue, 1 Aug 2017 23:55:49 +0000 (16:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c6419d6531613745bd3911f59bec65c2cbcbf51
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Tue, 1 Aug 2017 23:21:07 +0000 (23:21 +0000)]
Merge "Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f am:
8bf1f86606" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Tue, 1 Aug 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f
am:
8bf1f86606
Change-Id: I62028bca21ddcb1cdd2f9574615490c795a8cbd3
Sundeep Ghuman [Tue, 1 Aug 2017 23:15:30 +0000 (23:15 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am:
a048e3c03f
am:
dbb97833c6
Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:07 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: If07fc6d27b94cd515f2b205ab2cd77bd84302942
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:04 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd
Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8
am:
02cc8151a6
Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am:
58bbef15d8
Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Selim Cinek [Tue, 1 Aug 2017 00:47:45 +0000 (17:47 -0700)]
Fixed an issue where icons were jumping
Because width and height are different for icons on
some devices, the animation could jump unfortunately.
This was mainly introduced since we changed the
statusbar height.
Test: observe icon animations (Especially on last notification)
Change-Id: Iee4f63467895045146c92d68eb4f9ca8a38d943a
Fixes:
64008528
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
Selim Cinek [Tue, 1 Aug 2017 22:13:44 +0000 (22:13 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46
am:
0bd1f34c47
Change-Id: Iffdde7a0d291a3eac2d7442273b8bf1b2b7e0346
Selim Cinek [Tue, 1 Aug 2017 22:06:10 +0000 (22:06 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am:
bbd9264c46
am:
61029fb091
Change-Id: I360bce398225ee78979a50e8a89c71f7e9506b82
Selim Cinek [Tue, 1 Aug 2017 21:58:35 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301
Selim Cinek [Tue, 1 Aug 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I0e0d6fac50335a93b5ee15af75096d7db0389a70
Andrew Solovay [Tue, 1 Aug 2017 21:46:46 +0000 (21:46 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
am:
ce4d45e399
Change-Id: I64fd78a2730cdb2565c56bdf75938029f4c3df75
Android Build Merger (Role) [Tue, 1 Aug 2017 21:43:41 +0000 (21:43 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
d4b1a0985b am:
517927fa1a" into oc-mr1-dev-plus-aosp
OSDN Git Service
