OSDN Git Service
Roozbeh Pournader [Tue, 6 Jun 2017 22:44:03 +0000 (15:44 -0700)]
Replace mockito with a mock class in DynamicLayoutTest
Previously, a mocked object was used incorrectly in the test. It was
attached twice as a span, which would result in the second identical
span causing the first span to get removed.
Now we use two different instances of a mock class, to make sure we
are attaching different spans.
Fixes:
62217995
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib9f7a467410d28280d77a1023e0fc328c652e2af
TreeHugger Robot [Mon, 5 Jun 2017 19:18:43 +0000 (19:18 +0000)]
Merge "Add dumpsys option to print last restore status"
TreeHugger Robot [Mon, 5 Jun 2017 19:17:13 +0000 (19:17 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
Jerry Zhang [Mon, 5 Jun 2017 18:54:08 +0000 (18:54 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev am:
1d1cf13056
am:
8d5570b9e1
Change-Id: I792ed0959e5a24ef8893a1bd63e3a33278462556
Jerry Zhang [Mon, 5 Jun 2017 18:45:09 +0000 (18:45 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
am:
1d1cf13056
Change-Id: I6c9afcc05fa88bbbbe63ddd3ab948e887c350505
TreeHugger Robot [Mon, 5 Jun 2017 18:42:45 +0000 (18:42 +0000)]
Merge "Update zen introduction text"
Jerry Zhang [Mon, 5 Jun 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Remove ptp from persist config on boot" into oc-dev
TreeHugger Robot [Mon, 5 Jun 2017 18:31:00 +0000 (18:31 +0000)]
Merge "Misc fixes in settingslib"
TreeHugger Robot [Mon, 5 Jun 2017 18:20:58 +0000 (18:20 +0000)]
Merge "Status bar size tweaks"
TreeHugger Robot [Mon, 5 Jun 2017 18:20:10 +0000 (18:20 +0000)]
Merge "Fixup tinting for keyguard status bar"
Android Build Merger (Role) [Mon, 5 Jun 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev am:
2f84c4715d am:
54376bbd4b -s ours"
Selim Cinek [Mon, 5 Jun 2017 18:11:23 +0000 (18:11 +0000)]
Merge "Allow inline replying directly from the image"
Adam Lesinski [Mon, 5 Jun 2017 18:11:09 +0000 (18:11 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev am:
2f84c4715d
am:
54376bbd4b -s ours
Change-Id: I112b98965ed2004b1ef4ff19c7772b4ce10c4702
Adam Lesinski [Mon, 5 Jun 2017 17:54:37 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
am:
2f84c4715d
Change-Id: I266b8648e9aa292befa02c4e7dc0ce54f0b26e21
Android Build Merger (Role) [Mon, 5 Jun 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Merge "Protect instant apps from full apps" into oc-dev am:
4972aa30bf -s ours am:
266e587f6b -s ours"
Todd Kennedy [Mon, 5 Jun 2017 17:40:21 +0000 (17:40 +0000)]
Merge "Protect instant apps from full apps" into oc-dev am:
4972aa30bf -s ours
am:
266e587f6b -s ours
Change-Id: I302f180dc9813b015da800785feb493e8b9a0a7f
Android Build Merger (Role) [Mon, 5 Jun 2017 17:39:53 +0000 (17:39 +0000)]
Merge "Merge "Annotate locks" into oc-dev am:
373ab72112 am:
27c2b724ae"
Julia Reynolds [Mon, 5 Jun 2017 17:38:58 +0000 (17:38 +0000)]
Merge "Annotate locks" into oc-dev am:
373ab72112
am:
27c2b724ae
Change-Id: I180d360fbb2cde9f15e838f3880d2cd0f9eba4ca
Android Build Merger (Role) [Mon, 5 Jun 2017 17:38:32 +0000 (17:38 +0000)]
Merge "Merge "Don't allow blocked apps to post notifications" into oc-dev am:
2f77da6e10 am:
c9df14bad9"
Julia Reynolds [Mon, 5 Jun 2017 17:37:32 +0000 (17:37 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev am:
2f77da6e10
am:
c9df14bad9
Change-Id: I5ae26a30d35ee4015a27b8cbf127a43a1f7495cd
Android Build Merger (Role) [Mon, 5 Jun 2017 17:37:06 +0000 (17:37 +0000)]
Merge "Fix captive portal login ssl error overflow am:
c991275325 -s ours am:
1282acdc93"
Hugo Benichi [Mon, 5 Jun 2017 17:36:13 +0000 (17:36 +0000)]
Fix captive portal login ssl error overflow am:
c991275325 -s ours
am:
1282acdc93
Change-Id: Ifeb5739cf8e6df674978f94bb947fbcabe617b51
Android Build Merger (Role) [Mon, 5 Jun 2017 17:35:43 +0000 (17:35 +0000)]
Merge "Merge "Minor upstream selection refactoring" am:
12fe022fbd am:
2cb58deb7b am:
3e402328d5 am:
ea7a46cee6"
Adam Lesinski [Mon, 5 Jun 2017 17:34:57 +0000 (17:34 +0000)]
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev
Erik Kline [Mon, 5 Jun 2017 17:34:58 +0000 (17:34 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd am:
2cb58deb7b am:
3e402328d5
am:
ea7a46cee6
Change-Id: I2f0ed56e76f974e6ef79d3d6ae21524dbc80daf2
Android Build Merger (Role) [Mon, 5 Jun 2017 17:34:31 +0000 (17:34 +0000)]
Merge "Merge "Fix captive portal login ssl error overflow" am:
42409f9776 am:
a89aad8408 am:
f3f7cd007a am:
7412716459"
Hugo Benichi [Mon, 5 Jun 2017 17:33:39 +0000 (17:33 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776 am:
a89aad8408 am:
f3f7cd007a
am:
7412716459
Change-Id: Icdde90e1cc22c481495b2bcf859074ba1a188244
Android Build Merger (Role) [Mon, 5 Jun 2017 17:33:11 +0000 (17:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
5228e5d0cb -s ours am:
fb5fdf1012 -s ours"
Bill Yi [Mon, 5 Jun 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
5228e5d0cb -s ours
am:
fb5fdf1012 -s ours
Change-Id: Ib99c9f8b11e9cb0c2b8c8502e24b2f80ff23686c
Android Build Merger (Role) [Mon, 5 Jun 2017 17:31:57 +0000 (17:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
247911d184 -s ours am:
f6ee9682f8 -s ours"
Bill Yi [Mon, 5 Jun 2017 17:31:00 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
247911d184 -s ours
am:
f6ee9682f8 -s ours
Change-Id: I6b30b9b74c217f07949bd6e5c88bab860321995a
Android Build Merger (Role) [Mon, 5 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Merge "Move strings to SettingsLib so TV can use them" into oc-dev am:
5cb5bbdae0 am:
804222061a -s ours"
Roozbeh Pournader [Mon, 5 Jun 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Make underlining spans independent of actual class"
Tony Mantler [Mon, 5 Jun 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev am:
5cb5bbdae0
am:
804222061a -s ours
Change-Id: I646474a798fba26895dc69f47e5ccd73bdf12185
Bill Yi [Mon, 5 Jun 2017 17:25:23 +0000 (17:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f31a663316 -s ours
am:
77e6256bb9 -s ours
Change-Id: I6dc15e5bcc098df88d3aec57974b346656e15679
Android Build Merger (Role) [Mon, 5 Jun 2017 17:20:43 +0000 (17:20 +0000)]
Merge "Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am:
c3504d4f33 am:
d288ca8d2d"
Winson Chung [Mon, 5 Jun 2017 17:19:14 +0000 (17:19 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am:
c3504d4f33
am:
d288ca8d2d
Change-Id: I80aed8fd0d0a8573bd4b6cec7bf8c14878a0935c
Lei Yu [Mon, 5 Jun 2017 17:19:04 +0000 (17:19 +0000)]
Merge "Update strings related to BatteryInfo"
Todd Kennedy [Mon, 5 Jun 2017 16:44:45 +0000 (16:44 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
am:
4972aa30bf -s ours
Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5
TreeHugger Robot [Mon, 5 Jun 2017 16:40:52 +0000 (16:40 +0000)]
Merge "Add support for vibrator 1.1 HAL and TICK effect."
TreeHugger Robot [Mon, 5 Jun 2017 16:38:35 +0000 (16:38 +0000)]
Merge "Remove QS Gutter"
TreeHugger Robot [Mon, 5 Jun 2017 16:35:22 +0000 (16:35 +0000)]
Merge "Protect instant apps from full apps" into oc-dev
Julia Reynolds [Mon, 5 Jun 2017 15:30:31 +0000 (15:30 +0000)]
Merge "Annotate locks" into oc-dev
am:
373ab72112
Change-Id: I7b84a944d19c1a51d3893149e98c9e6ac96ba2af
Julia Reynolds [Thu, 16 Feb 2017 20:01:36 +0000 (15:01 -0500)]
Update zen introduction text
And add alarm text to QS & volume dialog.
Change-Id: I8e3c06d6629473c453e579f23c75acd7cdfd4db1
Fixes:
38303817
Fixes:
31533768
Fixes:
33815404
Test: manual
Julia Reynolds [Mon, 5 Jun 2017 15:22:53 +0000 (15:22 +0000)]
Merge "Annotate locks" into oc-dev
Alex Kulesza [Mon, 5 Jun 2017 15:12:51 +0000 (15:12 +0000)]
Merge "Remove BatteryDetail from BatterySaverTile"
Evan Laird [Tue, 30 May 2017 19:03:29 +0000 (15:03 -0400)]
Status bar size tweaks
++1dp for Data saver and Hotspot
--1dp for Total silence
>>1dp for Battery lightning bolt
Also implemented keyword "powersave" for `dispatchDemoCommand()` in
BatteryControllerImpl
Test: visual
Bug:
37013523
Change-Id: I027fd18aadeef5c49826c37db9f681c14175a3aa
Julia Reynolds [Mon, 5 Jun 2017 13:20:23 +0000 (13:20 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
am:
2f77da6e10
Change-Id: I17808b200cba543f163bea8e3326bcce4792ef1f
Jason Monk [Fri, 2 Jun 2017 16:50:24 +0000 (12:50 -0400)]
Remove QS Gutter
Test: manual
Change-Id: I10be3dfc9b9745f25b8fec3ef1f5d812441890ad
Fixes:
62234983
Julia Reynolds [Mon, 5 Jun 2017 13:12:51 +0000 (13:12 +0000)]
Merge "Don't allow blocked apps to post notifications" into oc-dev
Paul Duffin [Fri, 19 May 2017 08:05:54 +0000 (09:05 +0100)]
Added android.test.mock and android.test.mock.sdk targets
The android.test.mock will be used for any targets that require
android.test.mock classes but which do not already depend on the
sdk. It is also the library that will be added to the classpath
at runtime when an app has the following in their manifest.
<uses-library android:name="android.test.mock"/>
The android.test.mock.sdk will be used by targets that require
android.test.mock classes and which build against the SDK. It
contains stub classes (like android.jar). It is also the library
that will be copied into the optional directory of the SDK.
Bug:
30188076
Test: make checkbuild
Change-Id: Ia3fcd47c644b8e5a573f891571a7b3772eac63f9
Narayan Kamath [Mon, 5 Jun 2017 08:43:03 +0000 (08:43 +0000)]
Merge "ActivityManagerService: Add support for new stack dumping scheme."
Hugo Benichi [Mon, 5 Jun 2017 07:47:32 +0000 (07:47 +0000)]
Fix captive portal login ssl error overflow
am:
c991275325 -s ours
Change-Id: I258a2e8656ae8ab23855f80057a5e2733959660b
Erik Kline [Mon, 5 Jun 2017 04:48:22 +0000 (04:48 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd am:
2cb58deb7b
am:
3e402328d5
Change-Id: I6ee263014ad42f7e195cd5d1806916a5c3ef18e0
Erik Kline [Mon, 5 Jun 2017 04:38:51 +0000 (04:38 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd
am:
2cb58deb7b
Change-Id: I9868806741e17c23e8c9ed34e753062733af190e
Hugo Benichi [Mon, 5 Jun 2017 04:31:23 +0000 (04:31 +0000)]
Merge "New Metrics constants for captive portal related UI"
Erik Kline [Mon, 5 Jun 2017 04:28:16 +0000 (04:28 +0000)]
Merge "Minor upstream selection refactoring"
am:
12fe022fbd
Change-Id: I1984cf520c04cdc2751dca3d6029793a257a1592
Treehugger Robot [Mon, 5 Jun 2017 04:19:28 +0000 (04:19 +0000)]
Merge "Minor upstream selection refactoring"
Hugo Benichi [Mon, 5 Jun 2017 04:18:53 +0000 (04:18 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776 am:
a89aad8408
am:
f3f7cd007a
Change-Id: I1f162b171d750fed8f17ff96c6e684efa8f3cd3f
Hugo Benichi [Mon, 5 Jun 2017 04:09:22 +0000 (04:09 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776
am:
a89aad8408
Change-Id: Id56f6bddf188b80b5e371e78ea8a45df63742414
Hugo Benichi [Mon, 5 Jun 2017 03:59:14 +0000 (03:59 +0000)]
Merge "Fix captive portal login ssl error overflow"
am:
42409f9776
Change-Id: I71a035066c522d6e96a43dea32f07594861bdbed
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Merged-In: I9d037222798bd9d4c1736923afb71e3e14c68bcc
(cherry pick from commit
60d5f46d89038a6a46c38ac0e57d0762a67732cb)
Change-Id: I5cb6e53f5af9dc4b93be8da1d9b6e0e8958e561f
Treehugger Robot [Mon, 5 Jun 2017 03:47:58 +0000 (03:47 +0000)]
Merge "Fix captive portal login ssl error overflow"
Erik Kline [Sun, 4 Jun 2017 02:36:01 +0000 (11:36 +0900)]
Minor upstream selection refactoring
Specifically:
- relocated "tryCell" handling
- minor logging change
- remove unneeded checkExpectedThread()
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I2f5428206503fd222b959e695c26326df53038f1
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Change-Id: I9d037222798bd9d4c1736923afb71e3e14c68bcc
Fan Zhang [Sun, 4 Jun 2017 00:46:55 +0000 (17:46 -0700)]
Misc fixes in settingslib
Bug:
62039146
Fix:
62138362
Test: make RunSettingsLibRoboTests
- Do not use enhanced loop in lifecycle events to avoid Concurrent
modification exception.
- Tweak footer preference icon layout
- Add some logging to help debug future suggestion issues
Change-Id: I08eb3aca4b776a7d7e5db75dff8f92904d482aa3
Bill Yi [Sat, 3 Jun 2017 21:56:45 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5228e5d0cb -s ours
Change-Id: Iba14cc0d0ef8dfb745b946d9504e261a6ab2f519
Bill Yi [Sat, 3 Jun 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
247911d184 -s ours
Change-Id: I4137b8071cc8134687cfaac3ab38d9f86125edb0
TreeHugger Robot [Sat, 3 Jun 2017 21:49:40 +0000 (21:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Tony Mantler [Sat, 3 Jun 2017 21:49:13 +0000 (21:49 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
5cb5bbdae0
Change-Id: Ibfc27da75570401ba58a722fe46a7c58689a38d6
TreeHugger Robot [Sat, 3 Jun 2017 21:43:40 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:41:53 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f31a663316 -s ours
Change-Id: I349a8b805ab94428e62bcc5080771a1b675e0bcc
TreeHugger Robot [Sat, 3 Jun 2017 21:40:58 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:38:15 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 3 Jun 2017 21:32:58 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 3 Jun 2017 21:31:40 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 21:23:07 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Winson Chung [Sat, 3 Jun 2017 20:50:49 +0000 (20:50 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
am:
c3504d4f33
Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e
TreeHugger Robot [Sat, 3 Jun 2017 20:41:10 +0000 (20:41 +0000)]
Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
Bill Yi [Sat, 3 Jun 2017 17:05:08 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a02b8e0c5b650bb2194c2e510db310060f2cab9
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 16:49:02 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0ef25bc2553f5c933e0b5573c5e2b606d932d39
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 12:17:02 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I171ceb765374ef904105e7a8ed7fbf01337be265
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 12:10:59 +0000 (05:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id173840acdf93c20e287471bb51ea2127df0469e
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 11:47:33 +0000 (04:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8468ac3d22f323183b2343888d8f0fe88451a22a
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 10:14:54 +0000 (03:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f16f808f5ab850fb3bb459ea63548471d44eeca
Auto-generated-cl: translation import
Bill Yi [Sat, 3 Jun 2017 09:39:28 +0000 (02:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7a87753641973d604a36c283cb2484a6e5fceb2
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 3 Jun 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Move strings to SettingsLib so TV can use them"
Chong Zhang [Sat, 3 Jun 2017 02:33:06 +0000 (02:33 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev am:
0082de03e5
am:
46053192d9
Change-Id: Ib15d81464dd81ef916c0945e1f6d237bf8c6ecda
Chong Zhang [Sat, 3 Jun 2017 02:25:44 +0000 (02:25 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev
am:
0082de03e5
Change-Id: I39887ee66b1c09a2ab477978681866f407c72b81
TreeHugger Robot [Sat, 3 Jun 2017 02:20:17 +0000 (02:20 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 01:55:49 +0000 (01:55 +0000)]
Merge "AAPT2: Allow undefined resources (placeholders)"
Winson Chung [Sat, 3 Jun 2017 01:52:44 +0000 (01:52 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev am:
1eddb0cb2e
am:
d1a3b24b62
Change-Id: I1f5b291a0a0b4912df5996ff409eef8ec458d937
Winson Chung [Sat, 3 Jun 2017 01:44:41 +0000 (01:44 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev
am:
1eddb0cb2e
Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d
TreeHugger Robot [Sat, 3 Jun 2017 01:37:49 +0000 (01:37 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev
John Reck [Sat, 3 Jun 2017 01:19:57 +0000 (01:19 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev am:
a2f747c57c
am:
427eb020a6
Change-Id: I567e04d71350c8176a9b39f776fc3ba356c253fa
John Reck [Sat, 3 Jun 2017 01:11:08 +0000 (01:11 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
am:
a2f747c57c
Change-Id: I86355ce39a012f9db3a688198bebeadd7bde15c6
TreeHugger Robot [Sat, 3 Jun 2017 01:01:21 +0000 (01:01 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
Winson Chung [Sat, 3 Jun 2017 00:51:51 +0000 (00:51 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev am:
52a4125ffd
am:
159150c64a
Change-Id: Ie5a84b07a94966ba811e7d07a552cd3fa20e8cec
Winson Chung [Sat, 3 Jun 2017 00:44:58 +0000 (00:44 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev
am:
52a4125ffd
Change-Id: Ifc985e6368555fa1332315a1a6a52ced7fb705bd
OSDN Git Service
