303761 Commits

Author SHA1 Message Date
Yohei Yukawa
e79599ba99 Simplify stub TextServicesManager in layoutlib
As a preparation CL to work on Bug 7254002, this CL simplifies
the layoutlib mock class of TextServicesManager, which was mostly
as-is copied from the real one by a previous CL [1].

Although keeping maintaining one real class and one stub class is
still painful, it should be much better than maintaining the real
one and mostly the real one.

 [1]: I8c25f4919a2e97b56f705b59747e81cb6f45b07b
      f149ca784dd09bd97bd479ae254935ff3edaa617

Test: make layoutlib-tests layoutlib
Test: No new test failure in the following command.
      java -Dtest_res.dir=frameworks/base/tools/layoutlib/bridge/tests/res -cp .:/usr/share/java/junit4.jar:prebuilts/tools/common/m2/repository/junit/junit/4.12/junit-4.12.jar:prebuilts/tools/common/m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:prebuilts/misc/common/tools-common/tools-common-prebuilt.jar:prebuilts/misc/common/sdk-common/sdk-common.jar:prebuilts/misc/common/layoutlib_api/layoutlib_api-prebuilt.jar:prebuilts/misc/common/kxml2/kxml2-2.3.0.jar:prebuilts/tools/common/m2/repository/com/google/guava/guava/15.0/guava-15.0.jar:out/host/linux-x86/framework/layoutlib-tests.jar:out/host/linux-x86/framework/layoutlib.jar org.junit.runner.JUnitCore com.android.layoutlib.bridge.intensive.Main
Bug: 7254002
Change-Id: I03e95bae15dc04cc0df20c4fb7cc86c5f3c6ccde
2017-01-26 23:42:33 -08:00
Kazuki Kobayashi
4ea4f63d28 Merge "Fix clipping for date and time on QS" am: a5f968806e am: 6cad668a25 am: 8bf5945c3f
am: 02e50306f9

Change-Id: Ifa97ccb8a26ef547871a520a81ebe20820ed5bcc
2017-01-19 22:40:10 +00:00
Kazuki Kobayashi
02e50306f9 Merge "Fix clipping for date and time on QS" am: a5f968806e am: 6cad668a25
am: 8bf5945c3f

Change-Id: Ia811eba9511d385e74668a97db11df3b8d0e9315
2017-01-19 22:35:02 +00:00
Kazuki Kobayashi
8bf5945c3f Merge "Fix clipping for date and time on QS" am: a5f968806e
am: 6cad668a25

Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
2017-01-19 22:30:05 +00:00
Kazuki Kobayashi
6cad668a25 Merge "Fix clipping for date and time on QS"
am: a5f968806e

Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
2017-01-19 22:25:23 +00:00
Treehugger Robot
a5f968806e Merge "Fix clipping for date and time on QS" 2017-01-19 22:17:35 +00:00
Keyvan Amiri
4779e9970e Merge "Fixed the text styling for framework SeekBarPrefenrece" 2017-01-19 21:56:30 +00:00
TreeHugger Robot
b6ea3988a0 Merge "Fix up the tests." 2017-01-19 21:52:36 +00:00
TreeHugger Robot
f54bbe0868 Merge "Add Wi-Fi friction icons to AccessPointPreference." 2017-01-19 21:52:00 +00:00
Rebecca Silberstein
f96e22429c Merge "SystemServer: cherry-pick p2p service start" am: 4c937464eb am: 392f7d789c am: d3ff73eba4
am: da4ea530ee  -s ours

Change-Id: I4ecfb90df65dd582f2432d7c5705a4e8a555bd40
2017-01-19 21:41:02 +00:00
Rebecca Silberstein
da4ea530ee Merge "SystemServer: cherry-pick p2p service start" am: 4c937464eb am: 392f7d789c
am: d3ff73eba4

Change-Id: I9427fd6c760c58c6caf65800fbbfbaf2c35e3335
2017-01-19 21:36:03 +00:00
Rebecca Silberstein
d3ff73eba4 Merge "SystemServer: cherry-pick p2p service start" am: 4c937464eb
am: 392f7d789c

Change-Id: I737b1307f4c42b8c88974418e3b6dab6b117509f
2017-01-19 21:31:06 +00:00
Rebecca Silberstein
392f7d789c Merge "SystemServer: cherry-pick p2p service start"
am: 4c937464eb

Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c
2017-01-19 21:26:00 +00:00
Rebecca Silberstein
4c937464eb Merge "SystemServer: cherry-pick p2p service start" 2017-01-19 21:21:23 +00:00
Winson Chung
a0ad738594 Merge changes Iabb33606,I3c364ebe
* changes:
  Falling back to media session controls.
  Move activity to fullscreen stack when it is relaunched in PIP.
2017-01-19 20:50:48 +00:00
Jason Monk
a075479746 Merge "Fix crash from AssistManager" 2017-01-19 20:39:16 +00:00
Jason Monk
71d635251e Merge "Fix nav bar visibility on lock screen" 2017-01-19 20:37:52 +00:00
Stephen Chen
2c096596b7 Add Wi-Fi friction icons to AccessPointPreference.
Friction icons are added to the end of the Wi-Fi picker list items to
provide visual information such as whether a network is secured, or saved.
The first two badges added are a lock icon to indicate a secure network, and
an open lock to indicate a saved network that is also secure.

Test: manual inspection
Bug: 34281330
Change-Id: I04ce9bc4a5bd245398d5f3b308ccb30b7cf58270
2017-01-19 12:35:35 -08:00
TreeHugger Robot
699fd45347 Merge "Update Account Manager to use latest version of account discovery API." 2017-01-19 20:17:22 +00:00
Jason Monk
21380738ea Fix up the tests.
They got broken because the pre-submits were broken :(

Test: runtest systemui
Change-Id: I45d5b2d3e8614cd1d3fa7eb24da57c26588120ff
2017-01-19 15:13:31 -05:00
Mark Rathjen
2ce3bf3ed7 Merge "Fix NPE in SettingsProvider." 2017-01-19 20:12:24 +00:00
TreeHugger Robot
b4fb0ca6b5 Merge "Workaround for leaked dim layer." 2017-01-19 19:59:21 +00:00
Keyvan Amiri
f8b5f04e5a Fixed the text styling for framework SeekBarPrefenrece
SeekBarPreference provided by framework used the wrong text sizes for
title and summary for both material and non-material layouts. Made the
text appearance consistent with the rest of preference widgets in
framework.
Also note that the framework SeekBarPreference is hidden and cannot
be used externally. The support library version is provided under
v7 preference lib.

Bug: 34068978
Test: Making sure that the text styling matches the rest of framework
preference widgets.

Change-Id: I3947a0bdd995e183e07e73e088916c1a3359ffe0
2017-01-19 11:52:59 -08:00
Jiaquan He
f6ee7f01fe Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev am: 683ea24d6e
am: 520e74a2bc

Change-Id: Ib8b9f60b18bca548a1d29c7542edcdbdd21aaeaf
2017-01-19 19:50:35 +00:00
Jiaquan He
f2d9521a35 Add arrow key navigation support to Grid-based Recents. am: c0e1813944
am: 514bbfd880

Change-Id: I076eeea2f035bef9c3c2ec39aa900a3f2e9d585c
2017-01-19 19:49:24 +00:00
Jason Monk
865246dc9a Fix crash from AssistManager
It expects to have onConfiguration called at least once, so
make sure it has.

Test: runtest systemui
Bug: 34377261
Change-Id: Iba980b020ef2c175c7ffebedf946edb282be464c
2017-01-19 14:47:45 -05:00
Jiaquan He
520e74a2bc Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev
am: 683ea24d6e

Change-Id: I539d11f61f54df44e8e870be15493dbd2a2042a1
2017-01-19 19:43:59 +00:00
Jiaquan He
514bbfd880 Add arrow key navigation support to Grid-based Recents.
am: c0e1813944

Change-Id: I36781f21274e5c07f2e1e0d2f5d30a20982c4f24
2017-01-19 19:43:50 +00:00
TreeHugger Robot
24800734bc Merge "Remove NetworkScorerAppManager.isCallerActiveScorer()." 2017-01-19 19:43:10 +00:00
TreeHugger Robot
683ea24d6e Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev 2017-01-19 19:36:44 +00:00
Jason Monk
e28cd2fa9e Fix nav bar visibility on lock screen
StatusBarKeyguardViewManager was assuming that the navigation bar
was the root view in its window, which it isn't anymore. Add a
getRootView() to ensure it is always the root.

Change-Id: Ifeeecc1ae8d7b6c4235a1ce4767dad3919bf90e6
Fixes: 34452399
Test: lock device, tap on nav bar area
2017-01-19 14:33:05 -05:00
TreeHugger Robot
13bfbc9138 Merge "Added NAN temperature value handling to HardwarePropertiesManager." 2017-01-19 19:29:44 +00:00
yuanhao
823fe8481e Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327 am: 1a34a41268
am: 70abb5122a

Change-Id: I806e4ce4f01e28c3b7e413b6447154a3cf77aca5
2017-01-19 19:14:52 +00:00
yuanhao
70abb5122a Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327
am: 1a34a41268

Change-Id: Ic3673491705af125a88f66460996911244184fc8
2017-01-19 19:10:44 +00:00
Amith Yamasani
f45badefbb Merge "Protobufferize DiskStats dumpsys" 2017-01-19 19:08:12 +00:00
yuanhao
1a34a41268 Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb
am: 8d3a8b1327

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
2017-01-19 19:05:54 +00:00
TreeHugger Robot
bae6c26fdf Merge "Ensure we account for insets in minimized state." 2017-01-19 19:04:38 +00:00
Kang Li
002693910e Merge "Initialize Sharing Ranker with a pre-trained model." 2017-01-19 19:03:32 +00:00
yuanhao
8d3a8b1327 Merge "Fixed NPE in canAddMoreManagedProfiles"
am: a83222e4fb

Change-Id: Icd63296061485d29a95fa6c6735a8c1a91099afc
2017-01-19 19:00:55 +00:00
Treehugger Robot
a83222e4fb Merge "Fixed NPE in canAddMoreManagedProfiles" 2017-01-19 18:53:25 +00:00
Tyler Gunn
15470f9bfc Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218 am: d70e5d9317
am: 61650097ed

Change-Id: Icfeff293b66b1bb062095a857c8a22ac0dcbdd63
2017-01-19 18:44:10 +00:00
Tyler Gunn
61650097ed Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218
am: d70e5d9317

Change-Id: I20ba841ceefb5905bf81262d6c42ea4b252ba3d4
2017-01-19 18:39:50 +00:00
Tyler Gunn
d70e5d9317 Merge "Adding self-managed connection service APIs." am: 3a7253a09d
am: 2155be0218

Change-Id: I75319e09f352905ffa45194086b11711f9070c70
2017-01-19 18:34:53 +00:00
Adam Lesinski
8f3b174d90 Merge "Teach apps to refresh AppInfos without restarting" 2017-01-19 18:30:43 +00:00
Tyler Gunn
2155be0218 Merge "Adding self-managed connection service APIs."
am: 3a7253a09d

Change-Id: I5d7aa094d71e40bc2ce8e6d051c757a82d9c6083
2017-01-19 18:29:54 +00:00
Wale Ogunwale
f0a60a9c60 Workaround for leaked dim layer.
Tasks are some how leaking their dim layer. The root cause of Task
not properly cleaning-up its dim layer in Task.removeImmediately()
hasn't being identified, but the CL will prevent user devices from
getting into a bad state until we figure-out the cause for the leak.

Note that when this occurs the task has been completely removed from
the system and the only reference left to it is for the dim layer...

Bug: 34395537
Test: This is a workaround until the real problem is identified.
Change-Id: Id8d45edb3b6858be82e4f057ae3da480da4f4b59
2017-01-19 10:27:10 -08:00
Treehugger Robot
3a7253a09d Merge "Adding self-managed connection service APIs." 2017-01-19 18:23:34 +00:00
Hangyu Kuang
9deb7b5e73 Merge "media: Add new API to set next output file." 2017-01-19 18:17:45 +00:00
Jeremy Joslin
3ef77d3d0c Remove NetworkScorerAppManager.isCallerActiveScorer().
The method is no longer used.

Test: adb shell am instrument -e class android.net.NetworkScorerAppManagerTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 33781558
Change-Id: I2b4acd54a747bd480a4a91bac424d39e264ea882
2017-01-19 09:55:26 -08:00
Amith Yamasani
38f91ff986 Protobufferize DiskStats dumpsys
Bug: 34227723
Test: cts-tradefed run cts-dev -t CtsIncidentHostTestCases
Change-Id: I4c99b8d4a2f120bea3d0ab196c44f6634224d59b
2017-01-19 09:35:54 -08:00