OSDN Git Service
Christopher Tate [Sat, 1 Apr 2017 01:07:49 +0000 (01:07 +0000)]
Merge "Be more lenient about live wallpaper unavailability" into oc-dev
am:
8371f96e99
Change-Id: I719b00d1ec1298a3b661665f3785bbcaf221acc9
Bill Yi [Sat, 1 Apr 2017 01:06:52 +0000 (01:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
3d1d01a708 -s ours
Change-Id: Iba8badf1e7a93d1502c6eab8fb9bd9470cac818d
TreeHugger Robot [Sat, 1 Apr 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Be more lenient about live wallpaper unavailability" into oc-dev
Tyler Gunn [Sat, 1 Apr 2017 01:01:00 +0000 (01:01 +0000)]
Merge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev
am:
07891b13f1
Change-Id: I222c241d5e56a12736fa719f74f0a94790802d35
TreeHugger Robot [Sat, 1 Apr 2017 00:56:36 +0000 (00:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Tyler Gunn [Sat, 1 Apr 2017 00:54:21 +0000 (00:54 +0000)]
Merge "Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom." into oc-dev
Tyler Gunn [Sat, 1 Apr 2017 00:50:56 +0000 (17:50 -0700)]
Add SUBSTITUTE_NOTIFICATION_APP_NAME pregrant for Telecom.
Test: Manual
Bug:
36817809
Change-Id: I2d7439e3d0040b617a842812b6ae8bda3c32f1ee
Winson Chung [Sat, 1 Apr 2017 00:50:43 +0000 (00:50 +0000)]
Merge "Removing unnecessary permission." into oc-dev
am:
26437c0f22
Change-Id: I877a50a58ede582ee446160b3adbc8713a60b9ee
Winson Chung [Sat, 1 Apr 2017 00:49:36 +0000 (00:49 +0000)]
Merge "Fixing rotation issues." into oc-dev
am:
435da2c435
Change-Id: I618887e1760e7fffcc418fc9c137a925b480dd3f
Winson Chung [Sat, 1 Apr 2017 00:42:51 +0000 (00:42 +0000)]
Merge "Removing unnecessary permission." into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Fixing rotation issues." into oc-dev
Yohei Yukawa [Sat, 1 Apr 2017 00:15:11 +0000 (00:15 +0000)]
Merge "Use correct binding flags when reconnecting to IME" into oc-dev
am:
13df64aa8e
Change-Id: I95b199b5d06a66051367feb51aa8c578b7e29245
Jungshik Shin [Sat, 1 Apr 2017 00:11:51 +0000 (00:11 +0000)]
Merge "Use variable fonts for Noto Sans Khmer" into oc-dev
am:
f9f1f1c1c3
Change-Id: I0db841fa0079d5f402b5a8e960c21effd18d3c8c
Felipe Leme [Sat, 1 Apr 2017 00:09:26 +0000 (00:09 +0000)]
Merge "Moar pre-partitioning refactoring." into oc-dev
am:
92f76ba958
Change-Id: Ia6c04764c0df183849abb2e95254bc38b84c1c99
TreeHugger Robot [Sat, 1 Apr 2017 00:06:57 +0000 (00:06 +0000)]
Merge "Use correct binding flags when reconnecting to IME" into oc-dev
Karthik Ravi Shankar [Sat, 1 Apr 2017 00:01:31 +0000 (00:01 +0000)]
Merge changes from topic 'launch-2d-activities-vr' into oc-dev
am:
f04d039584
Change-Id: I820ec3a9c1379bf9bcc688e36bcfeb00ac753a22
TreeHugger Robot [Sat, 1 Apr 2017 00:00:48 +0000 (00:00 +0000)]
Merge "Use variable fonts for Noto Sans Khmer" into oc-dev
Karthik Ravi Shankar [Sat, 1 Apr 2017 00:00:38 +0000 (00:00 +0000)]
Add vr persistent mode enable/disable
am:
74db2a3667
Change-Id: Id2d298582d4a1ecb4d22d43b6265e008752eda77
Karthik Ravi Shankar [Fri, 31 Mar 2017 23:59:22 +0000 (23:59 +0000)]
Launch 2D activities in VR mode
am:
99493dbc94
Change-Id: I33c4458ca441b8e95d45516cce2bcb7eb020ee3f
TreeHugger Robot [Fri, 31 Mar 2017 23:51:58 +0000 (23:51 +0000)]
Merge "Moar pre-partitioning refactoring." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:48:18 +0000 (23:48 +0000)]
Merge changes from topic 'launch-2d-activities-vr' into oc-dev
* changes:
Allow shell uid to access Vr APIs
Add vr persistent mode enable/disable
Launch 2D activities in VR mode
Dianne Hackborn [Fri, 31 Mar 2017 23:29:01 +0000 (23:29 +0000)]
Merge "Implement issue #
36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
am:
2d161b1d3f
Change-Id: I4aed07a3ad88f3b171e92aaa70f88bcc4da131b8
Jason Monk [Fri, 31 Mar 2017 23:26:08 +0000 (23:26 +0000)]
Merge "QS: Add transient icon for hotspot" into oc-dev
am:
cf6fa5e951
Change-Id: Idc3873203538e1927c778ba1a2a34351921101e6
TreeHugger Robot [Fri, 31 Mar 2017 23:21:07 +0000 (23:21 +0000)]
Merge "Implement issue #
36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:18:40 +0000 (23:18 +0000)]
Merge "QS: Add transient icon for hotspot" into oc-dev
Winson Chung [Fri, 31 Mar 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
am:
2af994ec03
Change-Id: I6abd868698fb9f7b16e62938e608f75fb2d610f4
Bill Yi [Fri, 31 Mar 2017 23:13:43 +0000 (23:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4eb9a6dbcb -s ours
Change-Id: If8806b983b3402874e90a9e94a406a3a41bf21f6
Bill Yi [Fri, 31 Mar 2017 23:12:48 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4de7204ecc -s ours
Change-Id: Id1cce0985649693a270b0f00009f100d8754e226
Bill Yi [Fri, 31 Mar 2017 23:09:16 +0000 (23:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4fafb85225 -s ours
Change-Id: I22b22ec2a299d24a2fcccfba3e79b1e4ae937e40
TreeHugger Robot [Fri, 31 Mar 2017 23:07:20 +0000 (23:07 +0000)]
Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:06:55 +0000 (23:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:04:18 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 23:01:28 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 31 Mar 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
ddd95360a2 -s ours
Change-Id: Idaf543bfcbad9b802e10a78c29aa49cbf522ad1d
TreeHugger Robot [Fri, 31 Mar 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Winson Chung [Fri, 31 Mar 2017 19:48:28 +0000 (12:48 -0700)]
Removing unnecessary permission.
Bug:
36507456
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testFinishPipActivityWithTaskOverlay
Change-Id: I351b7afd648ceb0a200c01fa318c9a56dbe64a96
Winson Chung [Fri, 31 Mar 2017 01:15:30 +0000 (18:15 -0700)]
Fixing rotation issues.
- Ensuring that we can update the stack bounds of non-docked stacks upon
rotation while split screen is enabled (previously disabled)
- Fix issue where subsequent bounds calculations were using the animation
target bounds from the prior orientation
Bug:
36657966
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I810e35f907721ef5c781b914adac3273ea8da5c8
Christopher Tate [Fri, 31 Mar 2017 19:28:30 +0000 (12:28 -0700)]
Be more lenient about live wallpaper unavailability
- Give the app 5 more seconds to restart following a crash
- Presume that system-default wallpapers are robust, and don't fall back
to showing nothing at all if timing or update problems arise
- Improve logging about static imagery handling during boot
- For now, turn on a bit more logging about wallpaper activity
Bug
36573894
Bug
34979999
Test: manual
Change-Id: I787a351f1251b83451d55bb98a4e0de9ce17836a
Tyler Gunn [Fri, 31 Mar 2017 20:21:19 +0000 (20:21 +0000)]
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
am:
9220ff1f5a
Change-Id: I2bfe8a64253b73d26377985768d5a6aa4b470dc6
Christopher Tate [Fri, 31 Mar 2017 20:20:11 +0000 (20:20 +0000)]
Merge "Add 'am start-foreground-service' shell command" into oc-dev
am:
1157116b0c
Change-Id: Iefc320f2bd053e98cd7ec4b4f3df3f1492b417e9
Tyler Gunn [Fri, 31 Mar 2017 20:14:53 +0000 (20:14 +0000)]
Merge "Add feature constants in Call Log provider to identify HD and WIFI calls." into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 20:14:46 +0000 (20:14 +0000)]
Merge "Add 'am start-foreground-service' shell command" into oc-dev
BIN ZHOU [Fri, 31 Mar 2017 16:54:04 +0000 (11:54 -0500)]
Add feature constants in Call Log provider to identify HD and WIFI calls.
Makes use of existing features column in the provider.
Test: Manual
Bug:
35359461
Change-Id: I405893771a2dac2bb25a54065238917ac2d515c8
Chris Wren [Fri, 31 Mar 2017 19:58:59 +0000 (19:58 +0000)]
Merge "restore the title string un UsbDeviceManager" into oc-dev
am:
b0db4017e5
Change-Id: Ia3610251a9fa31b179bee8b5bae21dc24c3bed65
Brian Carlstrom [Fri, 31 Mar 2017 19:58:00 +0000 (19:58 +0000)]
Merge "Include likely IMEs in ANR dumping" into oc-dev
am:
794eeebd55
Change-Id: Ia9dafd2603dc902b4d5d4cd8d3baa29465f52a53
Yohei Yukawa [Thu, 30 Mar 2017 22:57:02 +0000 (15:57 -0700)]
Use correct binding flags when reconnecting to IME
Since ICS MR-1 [1], InputMethodManagerService (IMMS) establishes two
connections to an IME: one is for general connection and the other to
allow the system to adjust the IME's performance characteristics much
more like a foreground activity. The tricky point is that the former
connection can be re-connected not only IMMS#startInputInnerLocked() in
but also in IMMS#showCurrentInputLocked().
It turns out that some previous attempts to adjust BIND_ flags for the
former connection [2][3] were not applied to
IMMS#showCurrentInputLocked(). This CL addresses that inconsistency by
make it clear that IMMS establishes up to connections to the IME.
[1]: Id1f73de66dc93d63212183958a72119ad174318b
2c84cfc001fb92a71811bf7384b7f865ff31ff9d
[2]: I1724113f42abe7862e8aecb6faae5a7620245e89
c8230519728b14065effd3b7d4eca273ff86160c
[3]: Ie5793fd9b40d980fa18f80246326511ed6ae0597
f0f94d129b6eb3c48624e915898d86d4f2de59ff
Test: Manuall tested as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. tapas LatinIME && make -j
4. adb install -r out/target/product/generic/system/app/LatinIME/LatinIME.apk
5. Run a test program that keeps calling IMM#showSoftInput()
6. adb shell ime enable com.android.inputmethod.latin/.LatinIME
7. adb shell ime set com.android.inputmethod.latin/.LatinIME
8. adb shell dumpsys activity processes android
Make sure that there is a ConnectionRecord to
com.android.inputmethod.latin that has "CR !FG UI !VIS" bits.
9. adb install -r out/target/product/generic/system/app/LatinIME/LatinIME.apk
10. adb shell dumpsys activity processes android
Make sure that there is a ConnectionRecord to
com.android.inputmethod.latin that has "CR !FG UI !VIS" bits.
Fixes:
36727763
Change-Id: Ib7fa34b21e1fb8bb5b19a9b08e36d0565f3dd266
Brian Carlstrom [Fri, 31 Mar 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Add null check to InputMonitor.notifyANR" into oc-dev
am:
15010f2bd1
Change-Id: I95e8ad62dbea783056e14780a4daeba44ff93406
Chris Wren [Fri, 31 Mar 2017 19:49:04 +0000 (19:49 +0000)]
Merge "restore the title string un UsbDeviceManager" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:46:48 +0000 (19:46 +0000)]
Merge "Include likely IMEs in ANR dumping" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 19:46:13 +0000 (19:46 +0000)]
Merge "Add null check to InputMonitor.notifyANR" into oc-dev
Chris Wren [Fri, 31 Mar 2017 19:37:45 +0000 (15:37 -0400)]
restore the title string un UsbDeviceManager
Bug:
32584866
Test: make
Change-Id: I4e4dea064a1af194db5660b0765cc4c4b666584a
Jungshik Shin [Fri, 17 Mar 2017 21:56:17 +0000 (14:56 -0700)]
Use variable fonts for Noto Sans Khmer
Update fonts.xml to use NotoSansKhmer-VF.ttf.
The weight range of Khmer is also extended to have 9 weight instances
(three more than Roboto with 200, 600 and 800).
The width range for Khmer is left alone partly because of an apparent
lack of support in fonts.xml for non-normal width fallback fonts.
Note that Noto Sans Khmer UI is left alone because of a baseline issue.
BUG:
22667753
Test: See the QA instruction in comment 10 of the bug.
Test: fontchain_lint
Change-Id: Idf6d4fec86822663ac08feb8979edacbc6c709a0
Sudheer Shanka [Fri, 31 Mar 2017 19:08:35 +0000 (19:08 +0000)]
Merge "Update default max time of waiting for network state to get updated." into oc-dev
am:
f2cd4371fe
Change-Id: I8e11ab25744c48faa5831a0974bf6fb711482acf
Sudheer Shanka [Fri, 31 Mar 2017 19:03:07 +0000 (19:03 +0000)]
Merge "Update default max time of waiting for network state to get updated." into oc-dev
Sohani Rao [Fri, 31 Mar 2017 18:55:37 +0000 (18:55 +0000)]
Merge "Introduce Authentication Failure reason codes" into oc-dev
am:
398b37539b
Change-Id: I398f105602a12485282198df541cc6f4ef786bee
Sohani Rao [Fri, 31 Mar 2017 18:51:12 +0000 (18:51 +0000)]
Merge "Introduce Authentication Failure reason codes" into oc-dev
Garfield Tan [Fri, 31 Mar 2017 18:11:08 +0000 (18:11 +0000)]
Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev
am:
f6d9507a00
Change-Id: I331a447f0171c9eb3d3b564cfc170d5bf60e74b9
Garfield Tan [Fri, 31 Mar 2017 18:04:49 +0000 (18:04 +0000)]
Merge "Add flags for quick viewer to indicate capabilities of a document." into oc-dev
Peter Qiu [Fri, 31 Mar 2017 18:00:02 +0000 (18:00 +0000)]
Merge "SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint" into oc-dev
am:
70c429d37a
Change-Id: I71e226d3e17474d2e10d768bb3be5eee86a55520
TreeHugger Robot [Fri, 31 Mar 2017 17:54:13 +0000 (17:54 +0000)]
Merge "SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint" into oc-dev
Peter Qiu [Tue, 14 Mar 2017 22:51:22 +0000 (15:51 -0700)]
SettingsLib: wifi: encapsulate Passpoint configuration in AccessPoint
The configurations that are managed by "Saved Networks" page are
centered around the abstraction of AccessPoint. Since we will
need to manage Passpoint configuration in the "Saved Networks"
(for configuration removal), encapsulate necessary information
in an AccessPoint for a Passpoint configuration.
Bug:
34207710
Test: manual test
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ide556f5ec6c4ef9e1f82016efe17dc9860f298de
Jason Monk [Fri, 31 Mar 2017 17:19:26 +0000 (13:19 -0400)]
QS: Add transient icon for hotspot
Will make the loading time more clear.
Test: visual
Bug:
32270851
Change-Id: I0ea7591da132ff65fb7fc16b03b2891891e66598
Winson Chung [Thu, 30 Mar 2017 21:44:52 +0000 (14:44 -0700)]
Ensure we show the PiP menu in response to KEYCODE_WINDOW.
Bug:
36687605
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testWindowButtonEntersPip
Change-Id: I0bb35fd666eb6a438e4676267f6726b44bffb3db
Dianne Hackborn [Thu, 30 Mar 2017 20:49:13 +0000 (13:49 -0700)]
Implement issue #
36590595: Add ability to associated a ClipData with JobInfo
Yum!
Also needed to have a Context.revokeUriPermission() variant that is sane,
so reasonable CTS tests can be written.
Test: new ClipDataJobTest added.
Change-Id: Ia3135ea788a6e32c971bae7dab3a844d0ef4139c
Adrian Roos [Fri, 31 Mar 2017 17:39:40 +0000 (17:39 +0000)]
Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev
am:
f667aebe20
Change-Id: Iae45c9efabc48d27d11211a63e50bf94abe98300
Mady Mellor [Fri, 31 Mar 2017 17:35:28 +0000 (17:35 +0000)]
Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev
am:
8565eab156
Change-Id: I6ea47f95853616bb9198e02606d62a57d25e993a
Adrian Roos [Fri, 31 Mar 2017 17:31:45 +0000 (17:31 +0000)]
Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev
Mady Mellor [Fri, 31 Mar 2017 17:27:36 +0000 (17:27 +0000)]
Merge "Update PIP dismiss to show scrim + info text at the bottom of the screen" into oc-dev
Felipe Leme [Fri, 31 Mar 2017 15:23:06 +0000 (08:23 -0700)]
Moar pre-partitioning refactoring.
On ViewState: split value into mCurrentValue and mAutofilledValue.
On Session: replacing mAutofilledDataset by mDatasetWaitingAuth and
ViewState.getAutofilledValue() (mAutofilledDataset is still needed,
but will be removed in the first partitioning CL).
Also fixed a missed 'return' on TimePicker.autofill()
Bug:
35707731
Test: CtsAutoFillServiceTestCases pass
Change-Id: Icc32701ae3e499a77d99e6ae1daa7d070a3df631
Chris Wren [Fri, 31 Mar 2017 17:16:30 +0000 (17:16 +0000)]
Merge "standardize system notification IDs" into oc-dev
am:
441162562b
Change-Id: Idb39af001fefa77b6899c3c9d8816532b5e54dea
Chris Wren [Fri, 31 Mar 2017 17:09:42 +0000 (17:09 +0000)]
Merge "standardize system notification IDs" into oc-dev
Brian Carlstrom [Fri, 31 Mar 2017 07:24:18 +0000 (00:24 -0700)]
Add null check to InputMonitor.notifyANR
Followup to
7402ddf9b45efc9616676205534ce7b4fc3a13e6
Test: Start IME, induce ANR in Settings, verify /data/anr/traces.txt
Change-Id: I4ad1d48cc73ca1a4332414ff50a160c67979feef
Fixes:
36730136
Julia Reynolds [Fri, 31 Mar 2017 16:41:27 +0000 (16:41 +0000)]
Merge "Rename badge icon method" into oc-dev
am:
ed8d07f213
Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
Julia Reynolds [Fri, 31 Mar 2017 16:33:56 +0000 (16:33 +0000)]
Merge "Rename badge icon method" into oc-dev
Evan Rosky [Fri, 31 Mar 2017 16:32:29 +0000 (16:32 +0000)]
Merge "Prevent arrow keys from leaving editable TextViews" into oc-dev
am:
27b0a55fab
Change-Id: Ic9049789328e1e8396199e8c64b305ebe772766c
Evan Rosky [Fri, 31 Mar 2017 16:27:52 +0000 (16:27 +0000)]
Merge "Prevent arrow keys from leaving editable TextViews" into oc-dev
Chris Wren [Mon, 27 Mar 2017 19:01:44 +0000 (15:01 -0400)]
standardize system notification IDs
All the trivial cases, plus some fixes to try to
mitigate collisions with the complex ones.
Complex services to follow in another CL,
Bug:
32584866
Test: make framework services
Change-Id: Ie9663600171d8ede11676e9d66f009dbb06def03
Karthik Ravi Shankar [Sun, 26 Mar 2017 09:56:44 +0000 (02:56 -0700)]
Allow shell uid to access Vr APIs
Some of the Vr APIs in VrManagerService need to be accessed via shell to
be used for testing and for easy access. Add
android.permission.RESTRICTED_VR_ACCESS to shell uid.
Bug:
36071574
Test: adb shell vr set-persistent-vr-mode-enabled true
adb shell dumpsys vrmanager
>> Persistent VR mode is currently: enabled
adb shell vr set-persistent-vr-mode-enabled false
adb shell dumpsys vrmanager
>> Persistent VR mode is currently: disabled
Change-Id: I486fa19f93d5c6999aa479fdf7e5f2f48f765240
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Karthik Ravi Shankar [Sun, 26 Mar 2017 09:46:48 +0000 (02:46 -0700)]
Add vr persistent mode enable/disable
Persistent vr mode toggle control is needed sometimes from command line.
This also adds the infrastructure for future vr commands.
Bug:
36071574
Test: adb shell vr set-persistent-vr-mode-enabled true
adb shell dumpsys vrmanager
>> Persistent VR mode is currently: enabled
adb shell vr set-persistent-vr-mode-enabled false
adb shell dumpsys vrmanager
>> Persistent VR mode is currently: disabled
Change-Id: I47a858e0696a907e746d50e2c6ca3d18197864a7
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Karthik Ravi Shankar [Thu, 9 Mar 2017 02:30:19 +0000 (18:30 -0800)]
Launch 2D activities in VR mode
When in VR mode, launch all activities into the virtual display ID as
provided by the Compatibility display. This includes two cases -
- New activity launches
- Existing activity in the background.
Testing Done: Tested with PlanarVirtualDisplay app and Settings,
Calculator and GestureApp with different intent flags.
Bug:
36071574
Bug:
36071445
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testVrActivityLaunch
Test: #testVrActivityReLaunch
Change-Id: Ic590a7cbd6f9b339dc83b22a8ffb1252219ef22e
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Wyatt Riley [Fri, 31 Mar 2017 15:34:57 +0000 (15:34 +0000)]
Merge "IGnssDebug.hal change field outputs for dump()" into oc-dev
am:
87206c4ed8
Change-Id: Ia5edd05b111f3a7c87d06552e99bd1d144f50fe1
Android Build Merger (Role) [Fri, 31 Mar 2017 15:28:52 +0000 (15:28 +0000)]
Merge "Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794 am:
8f9a6c3e89 am:
dcd9608cbf" into oc-dev-plus-aosp
Wyatt Riley [Fri, 31 Mar 2017 15:28:16 +0000 (15:28 +0000)]
Merge "IGnssDebug.hal change field outputs for dump()" into oc-dev
Mark Renouf [Fri, 31 Mar 2017 15:28:03 +0000 (15:28 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794 am:
8f9a6c3e89
am:
dcd9608cbf
Change-Id: I0affebc907aa3f263f50be8f9262e3732ad7e7a4
Android Build Merger (Role) [Fri, 31 Mar 2017 15:27:34 +0000 (15:27 +0000)]
Merge "Merge "Add carrier config to hide merge button for IMS conference" am:
78b3cbe4e0 am:
ec22b62a3a am:
611d2fb148" into oc-dev-plus-aosp
Tyler Gunn [Fri, 31 Mar 2017 15:26:39 +0000 (15:26 +0000)]
Merge "Add carrier config to hide merge button for IMS conference" am:
78b3cbe4e0 am:
ec22b62a3a
am:
611d2fb148
Change-Id: Ie4a0b463905ac05527dc54ad8a47c3058994b212
Mark Renouf [Fri, 31 Mar 2017 15:25:24 +0000 (15:25 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794 am:
8f9a6c3e89
am:
270e4953d2
Change-Id: I2da923a61b7bdcbd481afc1d94e4b5d7437f2567
Mark Renouf [Fri, 31 Mar 2017 15:20:36 +0000 (15:20 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794
am:
8f9a6c3e89
Change-Id: Ie5fa2c8d64befee4f776dff6a01395099f83e5d9
Mark Renouf [Fri, 31 Mar 2017 15:20:24 +0000 (15:20 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794
am:
8f9a6c3e89
Change-Id: I10087b9982b3eceb200b447d4faecad4eb8d19fe
Tyler Gunn [Fri, 31 Mar 2017 15:18:30 +0000 (15:18 +0000)]
Merge "Add carrier config to hide merge button for IMS conference" am:
78b3cbe4e0
am:
ec22b62a3a
Change-Id: Ib3dd03021d74ab981d0d61e7013cea376ee4bc46
Mark Renouf [Fri, 31 Mar 2017 15:15:49 +0000 (15:15 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
am:
d1a0d19794
Change-Id: Ia0bdc13ac2e8f3e65aaa38a64b4af9409ffeaa21
Tyler Gunn [Fri, 31 Mar 2017 15:13:25 +0000 (15:13 +0000)]
Merge "Self Managed CS Implementation" into oc-dev
am:
3d9286e650 -s ours
Change-Id: I605e686dbf611025434e0169113bb9c3e55b3bdb
Tyler Gunn [Fri, 31 Mar 2017 15:12:37 +0000 (15:12 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
am:
78b3cbe4e0
Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
Tyler Gunn [Fri, 31 Mar 2017 15:06:42 +0000 (15:06 +0000)]
Merge "Self Managed CS Implementation" into oc-dev
Tyler Gunn [Fri, 31 Mar 2017 15:05:35 +0000 (15:05 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
Aaron Whyte [Fri, 31 Mar 2017 15:00:56 +0000 (15:00 +0000)]
Merge "Split scroll factor into a 2d float." into oc-dev
am:
774b1f1f37
Change-Id: I1424f902aba4580258539db4327c66f4a4532045
TreeHugger Robot [Fri, 31 Mar 2017 14:54:41 +0000 (14:54 +0000)]
Merge "Split scroll factor into a 2d float." into oc-dev
Anton Philippov [Fri, 31 Mar 2017 10:49:10 +0000 (10:49 +0000)]
Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev
am:
537fd18eaf
Change-Id: I7d83249d341d150d3cdd3aad9b784e6ef8a4b792
Anton Philippov [Fri, 31 Mar 2017 10:43:23 +0000 (10:43 +0000)]
Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev
Bill Yi [Fri, 31 Mar 2017 09:03:59 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic5ddb29c72414f5b06e61f9bb13b69489b2ac715
Auto-generated-cl: translation import
OSDN Git Service
