Commit Graph

71314 Commits

Author SHA1 Message Date
Neil Fuller
009e77a7bb Fix checkstyle import ordering issues
Fix checkstyle import ordering issues. These have been introduced
by various commits, all in goog/master.

This fixes the ordering before I land unrelated changes.

Commits:
640f30a776
782043caf8
35cda39422
a38fbf63fd

Bug: 37984816
Test: make -j30 droid
Change-Id: I158dcf38c024a294d38cdb40f8909d5d5113b199
2017-05-04 17:46:01 +01:00
Abodunrinwa Toki
1f07310a92 Merge "Only classify text when the toolbar is shown." into oc-dev am: a20b6ba1f2
am: 1b24ad6194

Change-Id: I0f12bda69956581e5cf8b0575b903133f34e03b1
2017-05-04 15:30:20 +00:00
Abodunrinwa Toki
1b24ad6194 Merge "Only classify text when the toolbar is shown." into oc-dev
am: a20b6ba1f2

Change-Id: I94619c59f052a170c3b40d8de25a5c6f7a71fa85
2017-05-04 15:24:23 +00:00
TreeHugger Robot
a20b6ba1f2 Merge "Only classify text when the toolbar is shown." into oc-dev 2017-05-04 15:15:34 +00:00
Neil Fuller
102db03dab Merge "Time zone update API classes" into oc-dev-plus-aosp 2017-05-04 15:12:23 +00:00
Neil Fuller
d25a198c5a Merge "More time zone update API classes" am: c301339498 am: 9798dc47b1 am: 2cf4771469
am: aac434b431

Change-Id: I9d37119e5b6952bad07bcb99c9606b0c76516b30
2017-05-04 15:06:25 +00:00
Neil Fuller
aac434b431 Merge "More time zone update API classes" am: c301339498 am: 9798dc47b1
am: 2cf4771469

Change-Id: Ic82572f406fd56dd11afce108e14ff0dcb45557e
2017-05-04 14:59:58 +00:00
Neil Fuller
167b047385 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

This contains a cherry-pick / conflict resolution of
commit bede17c216 after an automerger skip.
(cherry picked from commit bede17c216)

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 15:58:40 +01:00
Neil Fuller
2cf4771469 Merge "More time zone update API classes" am: c301339498
am: 9798dc47b1

Change-Id: Ia85f1ec883b8ac8cb9a93dfbfabacd1589aafe8f
2017-05-04 14:53:53 +00:00
Treehugger Robot
c301339498 Merge "More time zone update API classes" 2017-05-04 14:41:10 +00:00
Vladislav Kuzkokov
1307d25e25 Merge "Store "block uninstall" flag separately from the rest of package state." 2017-05-04 14:41:06 +00:00
Geoffrey Pitsch
439d921955 Merge "Developer setting to show toast for notifications without a channel" into oc-dev am: 3c0e3d8a36
am: 44448d640a

Change-Id: Ie2a407039d2df43da24f10047e91a7d98a85eaba
2017-05-04 14:21:44 +00:00
Geoffrey Pitsch
44448d640a Merge "Developer setting to show toast for notifications without a channel" into oc-dev
am: 3c0e3d8a36

Change-Id: Ib5f7130e2940365b3868f735fe2f9881a54f0e71
2017-05-04 14:15:51 +00:00
TreeHugger Robot
3c0e3d8a36 Merge "Developer setting to show toast for notifications without a channel" into oc-dev 2017-05-04 14:09:03 +00:00
Neil Fuller
3620392aca Merge "Time zone update API classes" am: cfe0c2f1ec
am: 463f3f8cf7

Change-Id: I519483f82e12a038e52f3b4813b0db0325749925
2017-05-04 14:06:56 +00:00
Neil Fuller
cfe0c2f1ec Merge "Time zone update API classes" 2017-05-04 13:51:39 +00:00
Neil Fuller
a8889fa7fa More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).

Bug: 31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
2017-05-04 14:11:09 +01:00
Neil Fuller
69320958b2 Merge "Time zone update API classes" 2017-05-04 13:02:44 +00:00
Abodunrinwa Toki
66c1627301 Only classify text when the toolbar is shown.
classifyText() is used to generate a menu item in the selection toolbar
to handle the selected text. In this cl we avoid calling classifyText()
when the selection is changing but instead call it when we are about to
show the toolbar.

Previously, we depended on invalidateActionModeAsync() to classify text
after a call to startActionMode(). Now that we've introduced
invalidateActionMode() we need to be able to tell
startSelectionActionMode() that we also want the text to be classified,
hence the introduction of an input parameter, "adjustSelection", to
startSelectionActionModeAysnc().

Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug: 34966796
Change-Id: I5b9fc9e8ab443f024f8ca461df5a4bcc6485d26b
2017-05-04 13:51:38 +01:00
Neil Fuller
bede17c216 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 12:32:53 +01:00
Karthik Ravi Shankar
60df13e750 Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev am: 1d01f9cf67
am: c4d7248cdd

Change-Id: I8714be5933827c015f1446d5231f5c1f704b53c3
2017-05-04 05:29:12 +00:00
Karthik Ravi Shankar
c4d7248cdd Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
am: 1d01f9cf67

Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d
2017-05-04 05:23:42 +00:00
Karthik Ravi Shankar
1d01f9cf67 Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev 2017-05-04 05:17:17 +00:00
Karthik Ravi Shankar
2b9aaedf63 Rename CompatibilityDisplay to Vr2dDisplay
CompatibilityDisplay used for displaying 2D activities in Vr world. This
is confusing in more than one way. To clarify what it really means,
rename it to Vr2dDisplay.

Changes in this CL -

- /s/CompatibilityDisplay/Vr2dDisplay
- /s/Compatibility/Vr2d - in CompatibilityDisplay context.

Bug: 37851944
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests
passes on Marlin.

Change-Id: I0a442302fa9d0f48bbd0c01a7766b94369e04386
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
2017-05-03 22:16:02 -07:00
gaoshang
ca8edea785 Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am: 36247646e3
am: 0f722b529c

Change-Id: Ic315d3c7d7cfc0132237de29fc7426d412cdb96b
2017-05-04 03:51:43 +00:00
Treehugger Robot
36247646e3 Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" 2017-05-04 03:37:37 +00:00
gaoshang
d66a86bf50 fix KeyEvent can't correctly finish when inputmethod time out happend
Symptom: If inputmethod handle an KeyEvent time out ,
Did not finish this event correctly , eventually lead to app ANR
Root Cause: without seq number when obtainMessage MSG_TIMEOUT_INPUT_EVENT
Solution: add seq parameter

Test: Input
Test: InputMethod

Fixes: 37648930
Change-Id: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Merged-In: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
2017-05-04 02:19:42 +00:00
Antony Sargent
0f1972d667 Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev am: d53a71f443
am: dc62fbe81b

Change-Id: I56c2eb9a3dca6e8dad1cbddeabe4ebbe471b4758
2017-05-04 01:51:05 +00:00
Antony Sargent
dc62fbe81b Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
am: d53a71f443

Change-Id: I735640f2c9c7a00ab206372ffa33f51621546e78
2017-05-04 01:43:00 +00:00
TreeHugger Robot
d53a71f443 Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev 2017-05-04 01:37:07 +00:00
Jeff Sharkey
c006456f51 Merge "Revert "Don't add other's child as header or footer"" into oc-dev am: 6e0332f308
am: a3ff1b35c5

Change-Id: I0376d88061f48ce95cdb4b26e5228989d760dafa
2017-05-04 01:16:29 +00:00
Jeff Sharkey
a3ff1b35c5 Merge "Revert "Don't add other's child as header or footer"" into oc-dev
am: 6e0332f308

Change-Id: I088c65f866de6a9df51784865531b0cc44ea4248
2017-05-04 01:11:36 +00:00
TreeHugger Robot
6e0332f308 Merge "Revert "Don't add other's child as header or footer"" into oc-dev 2017-05-04 01:04:01 +00:00
Siyamed Sinir
914d42dbcd Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev am: 5073b91236
am: fb37bba30d

Change-Id: I4dc4116e456af56969a4c7559e19fa6369f0df12
2017-05-04 00:48:08 +00:00
Siyamed Sinir
fb37bba30d Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
am: 5073b91236

Change-Id: I3320735cffac4a6802b0a4e64bf0a64e845ac6df
2017-05-04 00:37:01 +00:00
Siyamed Sinir
5073b91236 Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev 2017-05-04 00:27:31 +00:00
Ian Pedowitz
e2c45a5e20 Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df
am: c96a358318

Change-Id: If16a559a068f93f79c7c398323fe3f1bafe1aaf9
2017-05-04 00:23:27 +00:00
Ian Pedowitz
c96a358318 Merge "Revert "O is API 26"" into oc-dev
am: b42b9a22df

Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
2017-05-04 00:18:19 +00:00
Ian Pedowitz
b42b9a22df Merge "Revert "O is API 26"" into oc-dev 2017-05-04 00:07:10 +00:00
Felipe Leme
58c32e88fa Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev am: 246cc5bf51
am: 5152055973

Change-Id: Ie3ea24baf32960eeaa8c85b71e25b8ec017212a1
2017-05-03 23:42:27 +00:00
Felipe Leme
5152055973 Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
am: 246cc5bf51

Change-Id: Ie1e1e1edc6fc0b4202379dc61c7bb2167727ba6a
2017-05-03 23:34:29 +00:00
TreeHugger Robot
246cc5bf51 Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev 2017-05-03 23:16:15 +00:00
Jeremy Joslin
8ba35dc5a6 Merge changes from topic 'allow_none_scorer' into oc-dev am: d05dda1d40
am: 8cc43b6fa7

Change-Id: Ic2a3783d255482d0ae889c7501c2cdaf90ea2fed
2017-05-03 23:13:26 +00:00
Jeremy Joslin
8cc43b6fa7 Merge changes from topic 'allow_none_scorer' into oc-dev
am: d05dda1d40

Change-Id: I90864d95416167384c7acb9ac3d6beb8e523b682
2017-05-03 23:05:51 +00:00
TreeHugger Robot
d05dda1d40 Merge changes from topic 'allow_none_scorer' into oc-dev
* changes:
  Revert permission check on setActiveScorer.
  Allow the active scorer to be set to NULL.
2017-05-03 22:57:16 +00:00
Yifan Hong
d6fb4193f4 Merge "Add compatibility matrices to VintfObject.report()" into oc-dev am: 0e0a37635e
am: 2e5ed49e86

Change-Id: Iae5650ba5186dc73e0dc2b20bf1feee127100db4
2017-05-03 22:55:46 +00:00
Yifan Hong
2e5ed49e86 Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
am: 0e0a37635e

Change-Id: I6e2c660971c296f363b66baa43231e18464ffc34
2017-05-03 22:48:32 +00:00
TreeHugger Robot
0e0a37635e Merge "Add compatibility matrices to VintfObject.report()" into oc-dev 2017-05-03 22:39:08 +00:00
Ian Pedowitz
12025857cd Revert "O is API 26"
This reverts commit 9bcef8e2da.

Reason for revert:  b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
2017-05-03 22:00:56 +00:00
Adrian Roos
5f393e1c01 Merge "Notification: Remove actions from public view" into oc-dev am: 37963d61b2
am: b26c94ce4b

Change-Id: I1801ecae3fb327c8767f71d5e7f91c5cd581c448
2017-05-03 21:36:22 +00:00