Commit Graph

75019 Commits

Author SHA1 Message Date
Jack He
1a5e05cf34 Merge "Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199 am: 24ad4cfc48" into oc-mr1-dev-plus-aosp
am: 450c6035b5

Change-Id: I4ce490de222eb4e76f40e2989473a9ad37f70d7c
2017-08-24 22:41:41 +00:00
Garry Boyer
63431405de Merge "Remove child package max." 2017-08-24 22:28:15 +00:00
Jack He
bcdfca9030 Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199
am: 24ad4cfc48

Change-Id: I25df75f9cee3ebe0471fa7f9b3375d849ee31339
2017-08-24 22:10:22 +00:00
Yohei Yukawa
c6f9b06164 Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff
am: b737076a4e

Change-Id: I94a90ce699c420f6f761f55c31967ea407e1e8c5
2017-08-24 21:57:08 +00:00
Jack He
8ae5462199 Merge changes from topic "bt-fix-checkstyle-errors"
am: 838ab94a0f

Change-Id: I4e619cb17582a6cc954814654820cd945f66e1cc
2017-08-24 21:43:08 +00:00
Yohei Yukawa
b737076a4e Merge "New haptic feedback constants" into oc-mr1-dev
am: f3b78305ff

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
2017-08-24 21:14:36 +00:00
TreeHugger Robot
f3b78305ff Merge "New haptic feedback constants" into oc-mr1-dev 2017-08-24 21:02:57 +00:00
Andrii Kulian
d48474969e Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev am: 7ee92d5291
am: a64529a989

Change-Id: I52a93678621d3d28e88cd7cdbfbfca3c2a96f0b2
2017-08-24 20:39:54 +00:00
Siyamed Sinir
5186589eba Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
am: faba49c4d3

Change-Id: I2140b3ece38c8081de1b10ae5dbfa32ccf3acf90
2017-08-24 20:39:27 +00:00
Andrii Kulian
a64529a989 Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
am: 7ee92d5291

Change-Id: I8bfb1fb9f96489d9d11cc1b587d78b6a08a130ed
2017-08-24 20:14:28 +00:00
Etan Cohen
81c76a98f9 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev am: 19f12028b7
am: 58d610c5c2

Change-Id: I094ac271142898f356195ad23a7503121bae8b2a
2017-08-24 20:10:50 +00:00
Siyamed Sinir
faba49c4d3 Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
* changes:
  StaticLayout capped height should be 0 when maxLines=0
  Reset StaticLayout.mEllipsized during generate()
2017-08-24 19:59:22 +00:00
Andrii Kulian
7ee92d5291 Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev 2017-08-24 19:59:08 +00:00
Etan Cohen
58d610c5c2 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
am: 19f12028b7

Change-Id: I2a99242470c37ca423221ff31e2fdd72ea53d4f1
2017-08-24 19:54:06 +00:00
TreeHugger Robot
19f12028b7 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev 2017-08-24 19:29:02 +00:00
Roozbeh Pournader
2be7eff3a4 Merge "Use fallback-based line spacing in TextView etc" 2017-08-24 19:24:06 +00:00
Jack He
2992cd084c Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
  - "final private var" -> "private final var"
  - "&&", "+", "||" should not be at the end of line
  - Non-static private variable should be like "mVar"
  - Private static variable should be like "sVar"
  - Code file should always end with newline
  - Inherited methods should be annotated with @Override
    and no @hide tags
  - Public methods should always have a JavaDoc entry
  - "int[] array" is preferred over "int array[]"
  - private methods should be accessed without "this."
    when there is no name collisions.
  - "boolean ? true : false" -> boolean
  - "boolean ? false : true" -> !boolean
  - "boolean == true" OR "boolean != false" -> boolean
  - "boolean != true" OR "boolean == false" -> !boolean

Bug: 63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
2017-08-24 19:09:58 +00:00
Jack He
a355e5efaf Fix checkstyle errors (1/2)
* Automatic style corrections through IDE

Bug: 63596319
Test: make checkbuild, no manual changes, no functional changes
Change-Id: I2397d55abc34c9b7a9b748bec6137778df3421a7
2017-08-24 19:09:48 +00:00
Roozbeh Pournader
c4c3a0f5a9 Merge "Support fallback linespacing in DynamicLayout" 2017-08-24 18:38:00 +00:00
Yohei Yukawa
262dadf870 New haptic feedback constants
This CL introduces several haptic feedback constants that are ready
to be exposed to developers.

Test: checkbuild
Fixes: 64537070
Change-Id: If54d5bc6cab4e2c405615b7a40648c74a1097ea3
2017-08-24 10:51:00 -07:00
Roozbeh Pournader
612e67323f Merge "Add a builder for DynamicLayout and switch TextView to it" 2017-08-24 17:39:14 +00:00
Wale Ogunwale
d6fc25b757 Merge "Migrated some windowing methods from StackId to WindowConfiguration" 2017-08-24 17:32:08 +00:00
Chris Thornton
4a4db678aa Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev am: 0a14929b77
am: edb86c3933

Change-Id: Ia298587cd12331206038f70ddc949782105558f0
2017-08-24 16:31:19 +00:00
Chris Thornton
edb86c3933 Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
am: 0a14929b77

Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a
2017-08-24 16:20:08 +00:00
TreeHugger Robot
0a14929b77 Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev 2017-08-24 16:08:21 +00:00
Wale Ogunwale
3382ab1fc7 Migrated some windowing methods from StackId to WindowConfiguration
First pass at transitioning away from using stack ids for windowing mode
to WindowConfiguration. Added some TODO that will require the introduction
of applicationType in WindowConfiguration before additional conversation
can be done.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I2b315623faa16445a9f942e082089123842cb5a1
2017-08-24 08:57:10 -07:00
Etan Cohen
896c574bde [CS] Allow network factory implementations to re-evaluate requests
Change the evalRequests() API to protected to allow network factory
implementations to call the API.

A use-case of the API change is for factories temporarily reject a
request since they cannot fullfill it immediately but retry it at a
later time if/when conditions change.

Bug: 63866251
Test: integration tests
Change-Id: Idc50ce0799c67634b7b2fdbad78a26e443caf2e4
2017-08-24 06:47:55 -07:00
Jorim Jaggi
7559e6683c Merge "Sleep activities with AOD" into oc-mr1-dev am: f1ef6ef742
am: 2b99571564

Change-Id: Iae4b6dd49ba82cff1ba17b0d1265a085e1ad459e
2017-08-24 13:38:45 +00:00
Jorim Jaggi
2b99571564 Merge "Sleep activities with AOD" into oc-mr1-dev
am: f1ef6ef742

Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11
2017-08-24 13:26:16 +00:00
Jorim Jaggi
f1ef6ef742 Merge "Sleep activities with AOD" into oc-mr1-dev 2017-08-24 13:19:42 +00:00
TreeHugger Robot
1fdf6034df Merge "Expand the animation from the user's last touch point" 2017-08-24 13:06:13 +00:00
Alexandru-Andrei Rotaru
83f6c7f7a6 Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am: afe28cdf7e

Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09
2017-08-24 10:17:37 +00:00
TreeHugger Robot
afe28cdf7e Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev 2017-08-24 10:08:15 +00:00
Winson Chung
6d904f45db Merge "Move PiP state check exception to the client side" into oc-mr1-dev am: 3a02835a02
am: 82ff58e40e

Change-Id: I12a79c551d45acad5e701a4e727f67ffb4051fa4
2017-08-24 05:24:48 +00:00
Winson Chung
82ff58e40e Merge "Move PiP state check exception to the client side" into oc-mr1-dev
am: 3a02835a02

Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c
2017-08-24 05:12:43 +00:00
TreeHugger Robot
3a02835a02 Merge "Move PiP state check exception to the client side" into oc-mr1-dev 2017-08-24 05:00:48 +00:00
Roozbeh Pournader
5caf5a690f Use fallback-based line spacing in TextView etc
In TextView and Switch, version-gate the use of
setUseLineSpacingFromFallbacks() to apps targeting Android P and
later for backward compatibility.

In internal widgets, ImageFloatingTextView and SubtitleView, always
turn it on, since there is no backward compatibility concerns.

Bug: 28963299
Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.SwitchTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Change-Id: Icfe4e71ba26bbc6755ba12ddab72e6bf20b3ce25
2017-08-23 17:41:06 -07:00
Nate Fischer
da6710a9fe Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
am: bc99692f02

Change-Id: I515ab33e8a306c4f8c0cd64d0bc3d8269d0c1904
2017-08-23 23:56:56 +00:00
TreeHugger Robot
bc99692f02 Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev 2017-08-23 23:41:56 +00:00
Svetoslav Ganov
4a82f72efe Merge "Use all certs for computing package signing sha256" into oc-mr1-dev am: ee580764ad
am: 58d7ef66c5

Change-Id: If59ded7ac42c8277d12b8f65865806e8ffb9f036
2017-08-23 23:35:25 +00:00
Roozbeh Pournader
15b213d556 Support fallback linespacing in DynamicLayout
Bug: 28963299
Test: bit FrameworksCoreTests:android.text.
Change-Id: I132499d5927b26fb45522ffee99bac12aca3721f
2017-08-23 16:34:25 -07:00
Svetoslav Ganov
58d7ef66c5 Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
am: ee580764ad

Change-Id: Ie766ecd41d2ac07dd3608fa4ed69edc3c575058f
2017-08-23 23:21:18 +00:00
TreeHugger Robot
ee580764ad Merge "Use all certs for computing package signing sha256" into oc-mr1-dev 2017-08-23 22:51:41 +00:00
Andrii Kulian
732a90a794 Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD
Applied review comments but keeping the flag hidden for now.

Bug: 36555156
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testShowWhenLockedPublicVirtualDisplay
Change-Id: I1aa1289424d0d778bc0668c9ec69bc56f47891e3
2017-08-23 15:42:16 -07:00
Winson Chung
298f95b1ad Move PiP state check exception to the client side
- When calling enterPictureInPictureMode(), the state of the activity in
  the client may be out of sync with the state of the activity in the
  system, causing an exception to be thrown erroneously. Instead, fail
  silently in the system if this occurs, and throw the exception in the
  client when it attempts to enter PiP from an invalid state.

Bug: 63753007
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia99cc086805edc31f997d4325f7a5ccd7c85a77e
2017-08-23 15:06:32 -07:00
Roozbeh Pournader
22a167cac8 Add a builder for DynamicLayout and switch TextView to it
The builder mostly copies the structure and the logic of
StaticLayout.

We also improve various parts of code and documentation in
StaticLayout's builder.

Bug: 28963299
Test: bit FrameworksCoreTests:android.text.
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Test: bit CtsTextTestCases:*
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Change-Id: I5c4a6e031bd0f41f765a3d85e0b9b7e9be42ad4b
2017-08-23 15:05:06 -07:00
George Mount
2c0131aeb1 Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev am: 230e025841
am: 2d3e8b8ddb

Change-Id: I8077587dfcfd160028635d4dd11c0438317febc3
2017-08-23 21:18:14 +00:00
George Mount
2d3e8b8ddb Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
am: 230e025841

Change-Id: I8dbb21476f7d38a37c8e5b5732b51255b0bcba14
2017-08-23 21:03:46 +00:00
George Mount
230e025841 Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev 2017-08-23 20:52:34 +00:00
George Mount
3f81c33a35 Use hardware bitmap for shared element snapshots.
Bug: 64851247

Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.

Also fixed broken TransitionTest discovered while
testing.

Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf
2017-08-23 20:51:13 +00:00