Commit Graph

4094 Commits

Author SHA1 Message Date
android-build-team Robot
1cd00f3c8a Merge changes I5ed0feb5,I33faa3c8,Id2ee2e55,Iad0d4e94,I3ae5e544
* changes:
  Revert "Rotate IMEs (subtypes) by Meta+Space."
  Revert "Show toast when subtype is rotated by Meta-Space."
  Revert "Shift+Meta+Space should reverse-rotate subtypes."
  Revert "Shift+Meta+Space should reverse-rotate subtypes part 2."
  Revert "Make sure that Toast is always shown by Meta-Space."
2018-05-07 02:13:23 +00:00
android-build-team Robot
4abb099e14 Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev am: 564942d065
am: 2629cb09ea

Change-Id: Ic8858402a12e08ca1774d06a8b0d435ca40826e5
2018-05-04 16:59:54 -07:00
android-build-team Robot
2629cb09ea Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev
am: 564942d065

Change-Id: I4fa6433b1e0fa320568c0b8c5ed5f2ce5c93314b
2018-05-04 16:53:04 -07:00
android-build-team Robot
564942d065 Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev 2018-05-04 23:40:22 +00:00
Yohei Yukawa
136b6ceca8 Revert "Shift+Meta+Space should reverse-rotate subtypes."
This reverts commit d39ae85482 [1].

Reason for revert: to deprecate Meta-Space.

 [1]: I3694edd80be6dfe18b90360e24ae4d451b331928

Bug: 79150878
Test: manual
Change-Id: Id2ee2e552ffec009722525a56c65767bda46a63b
2018-05-04 12:53:19 -07:00
Andrii Kulian
1e7b265308 Merge "Preserve custom activity intent on relaunch" into pi-dev am: 1b59867b9f
am: 8dab13567a

Change-Id: I2fe6d88f2995ec10a65bf87825ff27dad6122760
2018-05-03 11:52:31 -07:00
Andrii Kulian
8dab13567a Merge "Preserve custom activity intent on relaunch" into pi-dev
am: 1b59867b9f

Change-Id: I7fa71c11e25e08d65b9e0a4e8349b934d6bf9cb1
2018-05-03 11:41:45 -07:00
Andrii Kulian
1b59867b9f Merge "Preserve custom activity intent on relaunch" into pi-dev 2018-05-03 18:26:04 +00:00
android-build-team Robot
9a63fa95c6 Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev am: 0d58b9bb64
am: 63180005bb

Change-Id: Ib584f14ae26d3b0ded27d80cab9a408699017e6a
2018-05-03 07:16:11 -07:00
android-build-team Robot
63180005bb Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev
am: 0d58b9bb64

Change-Id: I158c05e9bd15f9dda46bbcb09a313d7932d72c02
2018-05-03 07:06:35 -07:00
android-build-team Robot
0d58b9bb64 Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev 2018-05-03 13:55:38 +00:00
Andrii Kulian
770c403069 Preserve custom activity intent on relaunch
An activity can have a custom intent set via Activity#setIntent().
This was lost in ag/3305584

Change-Id: I88f3e164d2cf7f6c62989bba05cd84b9b83befc3
Fixes: 73181785
Test: ActivityThreadTest#testCustomIntentPreservedOnRelaunch
2018-05-02 18:40:59 -07:00
Adrian Roos
786ea783ea BackgroundFallback: Cover all cases where the fallback is needed
Fixes an issue where uncovered regions were not
covered if they are to the right or bottom of the
content view.

Fixes: 78661186
Test: Install test app from bug, enable cuotut, open test app, go to landscape, verify white fallback background is drawn in both landscape and seascape
Test: atest BackgroundFallbackTest
Change-Id: I442f03395a71550a534d64233762aa84002319dd
2018-05-02 12:58:54 +00:00
Wei Wang
b6e04d5383 Convert RTT background throttle to a settable value (1/2).
Bug: 69323456
Test: Manual test. Unit tests with runtest.sh.
Change-Id: I7dd3efc0ef3f0a12303f927da134abbd2383deb6
2018-04-30 19:49:02 -07:00
android-build-team Robot
4e606077cf Merge "Revert "Make InputMethod core tests presubmit"" 2018-05-01 01:15:05 +00:00
Tarandeep Singh
436748a105 Revert "Make InputMethod core tests presubmit"
This reverts commit f4f792ef66.

Reason for revert: All Core tests run as presubmit without annotation ever since cl/193219608. @Presubmit is redundant.

Bug: 78296014
Change-Id: I7f3b26c9cb5a4aa72591b4e55877b646fa846e73
2018-04-30 23:57:08 +00:00
android-build-team Robot
59667fe078 Merge "OMS: ensure framework overlays affect newly installed apps" into pi-dev am: 5c5e049a5e
am: 53de2ed4d3

Change-Id: Ifa8bb35a1d4f9e40af3cd25b924183c19827c392
2018-04-30 11:49:25 -07:00
android-build-team Robot
53de2ed4d3 Merge "OMS: ensure framework overlays affect newly installed apps" into pi-dev
am: 5c5e049a5e

Change-Id: I51a27550cb8cbbaff6fcea263c7355447aaf7b51
2018-04-30 11:28:13 -07:00
Mårten Kongstad
a3bd3491cc OMS: ensure framework overlays affect newly installed apps
Make sure to tell the package manager about an application's overlay
paths if there is at least one enabled overlay affecting the
application. This includes looking at framework overlays (which affect
all applications).

Also, add a test to verify the following flow:

  - Enable an overlay targeting "android"
  - Install an app
  - Launch the newly installed app
  - Assert that the newly installed app uses the framework overlay

Also, update InstallOverlayTests#installPlatformSignedFrameworkOverlay\
AndUpdate to assert the correct resource (framework instead of app
resource).

Bug: 78808367
Test: atest 'OverlayHostTests:InstallOverlayTests#enabledFrameworkOverlayMustAffectNewlyInstalledPackage'
Change-Id: Ic3450af6c2e827efce056874606caf1d853359eb
2018-04-30 17:28:35 +01:00
Abodunrinwa Toki
049932ac0d Merge "FloatingActionMode.setOutsideTouchable" into pi-dev am: 8e7f8ad3ce
am: 3ebb4719d8

Change-Id: I994b5fff9f4a560bd000687020a3e41a1c2e04f9
2018-04-27 13:32:32 -07:00
Abodunrinwa Toki
7eae745f0a Merge "TC: Fix null PendingIntent being passed to RemoteAction" into pi-dev am: 1290226564
am: 453c1225c5

Change-Id: Iff39f6d911f69b882bf9897150e080846a4e2bc4
2018-04-27 13:26:48 -07:00
Abodunrinwa Toki
3ebb4719d8 Merge "FloatingActionMode.setOutsideTouchable" into pi-dev
am: 8e7f8ad3ce

Change-Id: Ifb6a6eb13f7577ded8787fa5d1d6404c97bbf063
2018-04-27 13:10:06 -07:00
Abodunrinwa Toki
453c1225c5 Merge "TC: Fix null PendingIntent being passed to RemoteAction" into pi-dev
am: 1290226564

Change-Id: I2d55563201f7101c57e1f3091644130745c87ce4
2018-04-27 13:05:15 -07:00
Abodunrinwa Toki
8e7f8ad3ce Merge "FloatingActionMode.setOutsideTouchable" into pi-dev 2018-04-27 19:46:10 +00:00
Abodunrinwa Toki
1290226564 Merge "TC: Fix null PendingIntent being passed to RemoteAction" into pi-dev 2018-04-27 19:44:48 +00:00
Sudheer Shanka
dfc8b3ff8e Merge "Schedule external stats sync on battery level change with a delay" into pi-dev am: a750da1960
am: 0c3d9cefcb

Change-Id: I2961daf8ab38bed8f5d4fed804447b0ae2d66fa9
2018-04-26 20:46:41 -07:00
Sudheer Shanka
0c3d9cefcb Merge "Schedule external stats sync on battery level change with a delay" into pi-dev
am: a750da1960

Change-Id: I5af09a2df4458611ad9f3c9812dc0f787bddbd4f
2018-04-26 20:33:52 -07:00
Sudheer Shanka
a750da1960 Merge "Schedule external stats sync on battery level change with a delay" into pi-dev 2018-04-27 03:20:38 +00:00
Suprabh Shukla
991efe5467 Merge "Using a list to store usage events" into pi-dev am: 10b77a39a2
am: 38465c19b5

Change-Id: I33e640edc422df34ca47e1d7b0501aa44cccb53d
2018-04-26 16:29:22 -07:00
Suprabh Shukla
38465c19b5 Merge "Using a list to store usage events" into pi-dev
am: 10b77a39a2

Change-Id: I92f83289bd5a10b0a17012c2fd993ade0033375e
2018-04-26 16:17:55 -07:00
Abodunrinwa Toki
253827f207 TC: Fix null PendingIntent being passed to RemoteAction
Problem was RemoteAction(...) takes a non-null PendingIntent but
TextClassification.createPendingIntent(...) returns a nullable PendingIntent.

Bug: 78515224
Test: manual
  - Disable Contacts apps in settings
  - Select a phone number in a TextView
  - Verify that a Phone smart action is displayed
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Change-Id: Icab581d4eef38b4801d1b9ee3af04ffefd1eec6f
2018-04-27 00:16:13 +01:00
TreeHugger Robot
10b77a39a2 Merge "Using a list to store usage events" into pi-dev 2018-04-26 22:58:40 +00:00
Sudheer Shanka
0719c6af44 Schedule external stats sync on battery level change with a delay
and fix locking in scheduleCpuStatsSyncDueToWakelockChange().

Bug: 74146897
Test: atest cts/hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I2891dfb8a0aedf429232f45e26deab93c738506e
2018-04-26 15:43:40 -07:00
Nader Jawad
5dbc5aa22a Merge "Fixed issue where color attributes used for window background Activity themes would not be applied" 2018-04-26 22:04:30 +00:00
Nader Jawad
56c68bc296 Fixed issue where color attributes used for window background Activity
themes would not be applied

Updated windowBackground attribute in attrs.xml to take either a
reference or a color parameter. Updated PhoneWindow to consume the
drawable defined from the TypedArray. Added test to PhoneWindowTest to
handle verifying if a theme has a background color defined that it is
applied properly.

Fixes: 70268864
Test: Re-ran core tests on PhoneWindowTest with an updated test to
verify color literals are applied properly

Change-Id: I77083d5ee366ca0236633ac7039d2a5acf127fe7
2018-04-26 10:15:37 -07:00
Lei Yu
15214bbe42 Merge "Add ADAPTIVE_BATTERY_MANAGEMENT_ENABLED" into pi-dev am: 4620d9b3a3
am: a4940ae0b2

Change-Id: I0c8c974b880a0e0a7cad7edbc1391d578c018599
2018-04-25 17:14:58 -07:00
Lei Yu
a4940ae0b2 Merge "Add ADAPTIVE_BATTERY_MANAGEMENT_ENABLED" into pi-dev
am: 4620d9b3a3

Change-Id: I4890f4b4e1f8dbcf144b2e613165382d67b70de3
2018-04-25 17:02:26 -07:00
TreeHugger Robot
4620d9b3a3 Merge "Add ADAPTIVE_BATTERY_MANAGEMENT_ENABLED" into pi-dev 2018-04-25 23:37:43 +00:00
Suprabh Shukla
60aa35b756 Using a list to store usage events
Moving UsageEvent.Event objects to an array list sorted on the event
timestamps as there can be multiple events with the same timestamps.

Test: atest android.app.usage.EventListTest
Existing tests:
atest android.app.usage.cts.UsageStatsTest

Bug: 74406113
Change-Id: Idc7f2a8db6e5a9499b3b0b74efbf014b17fa495f
2018-04-25 16:36:35 -07:00
TreeHugger Robot
cc7dd57414 Merge "Default vibration amplitude resolution added" 2018-04-25 12:39:01 +00:00
Yohei Yukawa
b1845f317c Deprecate private AsciiCapable protocol
The concept "AsciiCapable InputMethodSubtype" was initially introduced
as a private protocol based on a magic keyword "AsciiCapable"
specified in "imeSubtypeExtraValue" attribute in API level 15 [1],
then became a public API "isAsciiCapable" attribute in API 19 [2].

However, it turns out that there remains one place in InputMethodUtils
where the previous private protocol is still used.

With this CL, InputMethodUtils stop relying on the previous private
AsciiCapable.

 [1]: I1a83b227498073c47567f73566043c273809adc9
      c36905673a
 [2]: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
      dc8abf6cee

Fix: 78537996
Test: make doc-comment-check-docs -j
Test: atest InputMethodPreferenceTest InputMethodUtilsTest
Change-Id: I56c0c19878657a41882c2d784e1ac96a52ab33f6
2018-04-24 18:36:23 -07:00
Alexey Kuzmin
55bdc59c53 Default vibration amplitude resolution added
Test: On sailfish, set vibration intensity to High, lock the phone and
unlock with FPS. Vibration should be played.
Bug: 76129874

Change-Id: I546341e55fa0e6de0af1d22c8e8e07d67670f0b9
Merged-In: I546341e55fa0e6de0af1d22c8e8e07d67670f0b9
2018-04-24 15:25:59 +01:00
Abodunrinwa Toki
29cb76849c FloatingActionMode.setOutsideTouchable
Make floating toolbar outside-touchable for link action mode in
non-selectable TextView.
This allows the user to be able to dismiss the toolbar by tapping
outside of the toolbar.

Bug: 78099871
Bug: 73156794
Bug: 78298142
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsViewTestCases:android.view.cts.ActionModeTest
Change-Id: I8e3b460d0b1baee48d4f9cb3f92e73926eeee231
2018-04-24 14:54:33 +01:00
TreeHugger Robot
8e2b316e52 Merge "Avoid internal method call and its branching." 2018-04-24 09:43:27 +00:00
Tomasz Wasilczyk
ae2a1d9503 Merge "Fix RadioTunerTest." into pi-dev am: 1fdddabc24
am: f970cde420

Change-Id: I245865e6a54a0468b19404094ab718f410e4ad31
2018-04-23 14:45:34 -07:00
Tomasz Wasilczyk
f970cde420 Merge "Fix RadioTunerTest." into pi-dev
am: 1fdddabc24

Change-Id: If00335a9b49d4a8ed6a609f144bc2c00b529c184
2018-04-23 14:32:23 -07:00
TreeHugger Robot
1fdddabc24 Merge "Fix RadioTunerTest." into pi-dev 2018-04-23 21:19:42 +00:00
Jake Wharton
fe16dfe76d Avoid internal method call and its branching.
This is a simple check that can be done locally.

Test: TextUtilsTest.java
Change-Id: I00f2a4fd087aa98ece2c3aa032e106496663b13f
2018-04-23 15:34:57 -04:00
Siyamed Sinir
742c26c07e Merge "Update Emoji.java for emoji 11" into pi-dev
am: 5ee0f5c1d7

Change-Id: Ide0fbd74e531f401b6e3a22b0cb84fb083486994
2018-04-23 11:53:25 -07:00
Siyamed Sinir
5ee0f5c1d7 Merge "Update Emoji.java for emoji 11" into pi-dev 2018-04-23 18:19:22 +00:00