OSDN Git Service

android-x86/frameworks-base.git
7 years agoConverting action bars to clusters.
Vadim Tryshev [Sat, 7 Jan 2017 03:30:00 +0000 (19:30 -0800)]
Converting action bars to clusters.

ActionBar keyboard navigation logic is now implemented via clusters.
Old implementation using setTouchscreenBlocksFocus and Ctrl+Shift+<
shortcut is removed.

Looking at the code, I can’t rule out existence of all 3 categories
(1) action bars with a nested toolbar, (2) action bars without a
nested toolbar and (3) Toolbars outside of action bars.
Because of this, I set “cluster” attribute both on action bar and
toolbar, and have code to avoid nested clusters in case (1).

Support lib’s action/tool bars aren’t converted, however, they
didn’t regress since Ctrl+Shift+< never worked for them. Will be
done after feature freeze.

Bug: 32151632
Test: Manual checks.
Change-Id: Ieb93980088c0fb385a9bc8a5d218ffc269b94dc5

7 years agoMerge "Fix Skia merge by fixing API mismatch."
TreeHugger Robot [Wed, 11 Jan 2017 21:19:55 +0000 (21:19 +0000)]
Merge "Fix Skia merge by fixing API mismatch."

7 years agoMerge "DozeService: Fix crash if StatusBar not yet initialized"
TreeHugger Robot [Wed, 11 Jan 2017 21:19:24 +0000 (21:19 +0000)]
Merge "DozeService: Fix crash if StatusBar not yet initialized"

7 years agoMerge "@hide RetentionPolicy.SOURCE annotation"
Makoto Onuki [Wed, 11 Jan 2017 21:14:16 +0000 (21:14 +0000)]
Merge "@hide RetentionPolicy.SOURCE annotation"

7 years agoMerge "Refactor ExpandableNotiRow"
TreeHugger Robot [Wed, 11 Jan 2017 21:12:55 +0000 (21:12 +0000)]
Merge "Refactor ExpandableNotiRow"

7 years agoMerge "Make hidden DevicePolicyManager#getDeviceOwnerComponentOnAnyUser system API."
TreeHugger Robot [Wed, 11 Jan 2017 21:11:01 +0000 (21:11 +0000)]
Merge "Make hidden DevicePolicyManager#getDeviceOwnerComponentOnAnyUser system API."

7 years agoMerge "Fix dirty Z prop"
TreeHugger Robot [Wed, 11 Jan 2017 20:55:05 +0000 (20:55 +0000)]
Merge "Fix dirty Z prop"

7 years agoMerge changes Iedf3172f,I62aa349b,I38c6970b
Selim Cinek [Wed, 11 Jan 2017 20:52:56 +0000 (20:52 +0000)]
Merge changes Iedf3172f,I62aa349b,I38c6970b

* changes:
  Using a different interpolator when unlocking to an app
  Adapted the shade closing interpolator
  Fixed the appearing of the statusbar icons

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY."
TreeHugger Robot [Wed, 11 Jan 2017 20:45:37 +0000 (20:45 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY."

7 years agoMerge "Show work unlock prompt on focus as well as touch"
TreeHugger Robot [Wed, 11 Jan 2017 20:38:54 +0000 (20:38 +0000)]
Merge "Show work unlock prompt on focus as well as touch"

7 years agoMerge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0f...
Jeremy Joslin [Wed, 11 Jan 2017 20:16:08 +0000 (20:16 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95 am: ab9eb11e2f
am: ad9ff9c59a  -s ours

Change-Id: I990d6c6a3aa7ad0fd170ba2b2d0c8a7c75232fe7

7 years agoMerge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
Jeremy Joslin [Wed, 11 Jan 2017 20:08:49 +0000 (20:08 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
am: ab9eb11e2f

Change-Id: Iede47bf5a625ac4183919b4253c6d5e3f92520bc

7 years agoMerge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
Jeremy Joslin [Wed, 11 Jan 2017 19:59:27 +0000 (19:59 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
am: 425a0fdc95

Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903

7 years agoFix Skia merge by fixing API mismatch.
Derek Sollenberger [Wed, 11 Jan 2017 16:09:48 +0000 (11:09 -0500)]
Fix Skia merge by fixing API mismatch.

Test: compile
Change-Id: Ie524af03fd3c85cceac13abdcdd9af8ef6ca6bb9

7 years agoDozeService: Fix crash if StatusBar not yet initialized
Adrian Roos [Tue, 3 Jan 2017 20:13:49 +0000 (12:13 -0800)]
DozeService: Fix crash if StatusBar not yet initialized

Fixes a bug where a crashing SystemUI may crash again after restarting
if the services restart in an unexpected order.

Bug: 34044765
Test: Crash SystemUI, observe that it doesn't crash again right away.
Change-Id: Id6f781ba29ff11be0850b1883ca2942f15e76324

7 years agoMerge "Separate render and verify in tests"
Jerome Gaillard [Wed, 11 Jan 2017 19:54:44 +0000 (19:54 +0000)]
Merge "Separate render and verify in tests"

7 years agoMerge "Move getActiveScorerPackage() to the score service."
Jeremy Joslin [Wed, 11 Jan 2017 19:52:37 +0000 (19:52 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
am: b5488ec3b3

Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c

7 years agoMerge "Move getActiveScorerPackage() to the score service."
Treehugger Robot [Wed, 11 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Move getActiveScorerPackage() to the score service."

7 years agoMerge "Add missing break statement to fix cts test"
TreeHugger Robot [Wed, 11 Jan 2017 19:39:03 +0000 (19:39 +0000)]
Merge "Add missing break statement to fix cts test"

7 years agoMerge "Add one-shot plugin support"
TreeHugger Robot [Wed, 11 Jan 2017 19:35:19 +0000 (19:35 +0000)]
Merge "Add one-shot plugin support"

7 years agoFix dirty Z prop
John Reck [Wed, 11 Jan 2017 19:26:43 +0000 (11:26 -0800)]
Fix dirty Z prop

Test: none
Change-Id: I886d50e58d6f404c6d19860a3032ca1b2854e073

7 years agoRefactor ExpandableNotiRow
Adrian Roos [Wed, 11 Jan 2017 19:18:48 +0000 (11:18 -0800)]
Refactor ExpandableNotiRow

Test: manual
Change-Id: I00e2b7ed3b710d3d6b656dfabec209bb8b22f390

7 years agoMerge "Added TaskWindowContainerController"
TreeHugger Robot [Wed, 11 Jan 2017 19:14:52 +0000 (19:14 +0000)]
Merge "Added TaskWindowContainerController"

7 years agoMerge "Do not select an importance for unspecified notifications"
TreeHugger Robot [Wed, 11 Jan 2017 19:13:33 +0000 (19:13 +0000)]
Merge "Do not select an importance for unspecified notifications"

7 years agoMerge "Add support for dummy draws for Vulkan webview and texture views."
Greg Daniel [Wed, 11 Jan 2017 19:01:49 +0000 (19:01 +0000)]
Merge "Add support for dummy draws for Vulkan webview and texture views."

7 years agoMerge "Load WebViewChromiumFactoryProviderForO"
Tao Bai [Wed, 11 Jan 2017 19:01:22 +0000 (19:01 +0000)]
Merge "Load WebViewChromiumFactoryProviderForO"

7 years agoMerge "Break Layer class into Gl and Vulkan subclasses"
Greg Daniel [Wed, 11 Jan 2017 19:00:31 +0000 (19:00 +0000)]
Merge "Break Layer class into Gl and Vulkan subclasses"

7 years agoMerge "Add new system api to pass parameters from Oobconfig to ManagedProvisioning"
TreeHugger Robot [Wed, 11 Jan 2017 18:56:35 +0000 (18:56 +0000)]
Merge "Add new system api to pass parameters from Oobconfig to ManagedProvisioning"

7 years agoMerge "Fix typo that caused excessive display config updates"
Andrii Kulian [Wed, 11 Jan 2017 18:46:56 +0000 (18:46 +0000)]
Merge "Fix typo that caused excessive display config updates"

7 years agoAdd ticker text for network logging notification am: df7bfcfc22
phweiss [Wed, 11 Jan 2017 18:43:02 +0000 (18:43 +0000)]
Add ticker text for network logging notification am: df7bfcfc22
am: 8b2472a428

Change-Id: I177295c148dd076889a64ab839d71e56de6e78a8

7 years agoAdd ticker text for network logging notification
phweiss [Wed, 11 Jan 2017 18:37:58 +0000 (18:37 +0000)]
Add ticker text for network logging notification
am: df7bfcfc22

Change-Id: Iff2f2e9866eb9b4bc018965bdd48eaff5bbc9af3

7 years agoMerge "Use bitfields in GNSS HAL"
TreeHugger Robot [Wed, 11 Jan 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Use bitfields in GNSS HAL"

7 years agoMerge "Update the javadoc on requestPinShortcut() about multiple..."
Makoto Onuki [Wed, 11 Jan 2017 18:13:00 +0000 (18:13 +0000)]
Merge "Update the javadoc on requestPinShortcut() about multiple..."

7 years agoMerge "Add a required main category for multi logs."
Alison Cichowlas [Wed, 11 Jan 2017 17:54:11 +0000 (17:54 +0000)]
Merge "Add a required main category for multi logs."

7 years agoShow work unlock prompt on focus as well as touch
Robin Lee [Wed, 11 Jan 2017 17:46:55 +0000 (17:46 +0000)]
Show work unlock prompt on focus as well as touch

With change I4576aaafa141ef5297f9c18935b747693a80f0fd we can be
reasonably sure this isn't going to instantly bring the prompt into
fullscreen, since launching this activity as an overlay in an
unfocused task won't bring it to the front.

But if it's launched in a focused task, it will get focused and
brought to the front, starting the unlock process. This saves us a
click, and user frustration, and is generally a good thing.

Bug: 31001762
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest (harness)
Change-Id: Ic5a33589e2b63d04e47c5f166da0077188cb55ea

7 years agoDo not select an importance for unspecified notifications
Geoffrey Pitsch [Wed, 11 Jan 2017 17:48:09 +0000 (12:48 -0500)]
Do not select an importance for unspecified notifications

Test: runtest systemui-notification
Bug: 34164846
Change-Id: I4988ce26264853fd9ab84ae02e995641edf933cd

7 years agoMerge changes I3fd28e69,If43820b6
Robin Lee [Wed, 11 Jan 2017 17:40:58 +0000 (17:40 +0000)]
Merge changes I3fd28e69,If43820b6

* changes:
  Lock work tasks from SystemUI instead of ActivityStarter
  Bounce work challenge through a WorkLockActivity

7 years agoMerge "Revert "Update active fingerprint group when switching profiles""
TreeHugger Robot [Wed, 11 Jan 2017 17:22:51 +0000 (17:22 +0000)]
Merge "Revert "Update active fingerprint group when switching profiles""

7 years agoAdded TaskWindowContainerController
Wale Ogunwale [Fri, 16 Dec 2016 02:27:00 +0000 (18:27 -0800)]
Added TaskWindowContainerController

For linking TaskRecord in AMS to Task window container in WMS.

Bug: 30060889
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: Existing test pass and manual testing.
Change-Id: I16248f3e96e5087ba24198a48a3bd10a12ae76a6

7 years agoMerge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd...
Akira Oshimi [Wed, 11 Jan 2017 17:18:09 +0000 (17:18 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd am: d999e53487
am: fb6616a6a6

Change-Id: Id4a4ef2672c614ac4343becf238f654c8e83caa5

7 years agoMerge "resolve merge conflicts of 082a1721b516 to master"
Mark Salyzyn [Wed, 11 Jan 2017 17:12:59 +0000 (17:12 +0000)]
Merge "resolve merge conflicts of 082a1721b516 to master"

7 years agoAdded BUGREPORT_OPTION_TELEPHONY.
Felipe Leme [Thu, 5 Jan 2017 22:57:12 +0000 (14:57 -0800)]
Added BUGREPORT_OPTION_TELEPHONY.

This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.

BUG: 32589463
BUG: 26849505
Test: manual
Change-Id: I6f90c02779a1e8aead690428626e3b9f06aa04df

7 years agoMerge "Accessibility support for ClickableSpan"
Phil Weaver [Wed, 11 Jan 2017 16:42:26 +0000 (16:42 +0000)]
Merge "Accessibility support for ClickableSpan"

7 years agoresolve merge conflicts of 082a1721b516 to master
Mark Salyzyn [Wed, 11 Jan 2017 16:30:03 +0000 (08:30 -0800)]
resolve merge conflicts of 082a1721b516 to master

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

7 years agoAdd one-shot plugin support
Jason Monk [Wed, 4 Jan 2017 20:13:11 +0000 (15:13 -0500)]
Add one-shot plugin support

Should have happened a while ago.

Test: runtest systemui
Change-Id: I0da4deb5c297e8030213810815a408364ec97e14

7 years agoresolve merge conflicts of 46c39f6c3640 to master
Neil Fuller [Wed, 11 Jan 2017 16:15:13 +0000 (16:15 +0000)]
resolve merge conflicts of 46c39f6c3640 to master

Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052

7 years agoMerge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
Akira Oshimi [Wed, 11 Jan 2017 16:11:53 +0000 (16:11 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
am: d999e53487

Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce

7 years agoUse bitfields in GNSS HAL
Hridya Valsaraju [Wed, 11 Jan 2017 16:07:40 +0000 (08:07 -0800)]
Use bitfields in GNSS HAL

Test: mm
Bug: 31974439
Change-Id: Ic14715d7bc55a3460756b07190bf02d6cebe3c52

7 years agoMerge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
Akira Oshimi [Wed, 11 Jan 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
am: 49b68ad0cd

Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d

7 years agoMerge "Fixes for FlashlightTile lifecycle"
TreeHugger Robot [Wed, 11 Jan 2017 16:02:51 +0000 (16:02 +0000)]
Merge "Fixes for FlashlightTile lifecycle"

7 years agoMerge "Fix clipping for edit screen of Quick Settings"
Akira Oshimi [Wed, 11 Jan 2017 16:01:23 +0000 (16:01 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
am: e3677865a8

Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9

7 years agoSeparate render and verify in tests
Diego Perez [Thu, 17 Nov 2016 16:04:39 +0000 (16:04 +0000)]
Separate render and verify in tests

Test: Test refactoring. Tests still pass
Change-Id: Icdee3eb9ef1b2639418110583ac74a3fd5362166
(cherry picked from commit 564b00dd5201711c25a3580aa21be8b36bfaf923)

7 years agoMerge "Call onApplyWindowInsets after requestApplyWindowInsets"
Diego Perez [Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)]
Merge "Call onApplyWindowInsets after requestApplyWindowInsets"

7 years agoMerge "Fix clipping for edit screen of Quick Settings"
Treehugger Robot [Wed, 11 Jan 2017 15:51:36 +0000 (15:51 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b...
Lenka Trochtova [Wed, 11 Jan 2017 15:48:30 +0000 (15:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f am: 44a53bab46
am: aa369e5d19

Change-Id: Iac1ae24754e012d31341f3a2b6fec3c637180f8e

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143c...
Mark Salyzyn [Wed, 11 Jan 2017 15:45:46 +0000 (15:45 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am...
Neil Fuller [Wed, 11 Jan 2017 15:45:29 +0000 (15:45 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc
am: 75f84f2261

Change-Id: I5cf584048e1e2cde67c33d77e99cd181db4e8c82

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d...
Richard Uhler [Wed, 11 Jan 2017 15:41:36 +0000 (15:41 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd am: 4911e517ab
am: c662c1541b

Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e...
Erik Kline [Wed, 11 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e am: 305796276b
am: 1559d51f86

Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
Mark Salyzyn [Wed, 11 Jan 2017 15:40:24 +0000 (15:40 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: a00c235600
Santos Cordon [Wed, 11 Jan 2017 15:39:30 +0000 (15:39 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: a00c235600
am: 27e121f27f

Change-Id: I527300ce4f4182c278a2e065f2e5a3c322c79433

7 years agoAdd Brightness setting for VR Mode. am: d6a5660a2c
Santos Cordon [Wed, 11 Jan 2017 15:38:29 +0000 (15:38 +0000)]
Add Brightness setting for VR Mode. am: d6a5660a2c
am: f85ab8306f  -s ours

Change-Id: Iea1f7d32d9c478fd7b1e0477ec12d811d6bd0daf

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h"
Mark Salyzyn [Wed, 11 Jan 2017 15:35:19 +0000 (15:35 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08

7 years agoRevert "Update active fingerprint group when switching profiles"
Rubin Xu [Wed, 11 Jan 2017 15:24:14 +0000 (15:24 +0000)]
Revert "Update active fingerprint group when switching profiles"

This reverts commit d37c824c14f32d1863ed9f86045e7c1ec2002e8c.

Change-Id: Id9c7a9c1fef276aa45f4ffc7559f61d1dbdaf7ba

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h"
Mark Salyzyn [Wed, 11 Jan 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cd...
Neil Fuller [Wed, 11 Jan 2017 15:13:08 +0000 (15:13 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 am: 5be9960f66
am: d544a4c682

Change-Id: I9e2ee5c872aaa500378900962899672f318e294c

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b...
Lenka Trochtova [Wed, 11 Jan 2017 15:09:46 +0000 (15:09 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f
am: 44a53bab46

Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276

7 years agoAdd ticker text for network logging notification
phweiss [Tue, 10 Jan 2017 18:31:07 +0000 (19:31 +0100)]
Add ticker text for network logging notification

Set ticker text to title for accessibility.

Bug:31207965
Test: manual

Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9
(cherry picked from commit d4a54bbfd1902dccb0e4de03f15bfbbba50b9531)

7 years agoMerge "Add ticker text for network logging notification"
Philipp Weiß [Wed, 11 Jan 2017 15:03:25 +0000 (15:03 +0000)]
Merge "Add ticker text for network logging notification"

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
Neil Fuller [Wed, 11 Jan 2017 15:02:42 +0000 (15:02 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
am: 5be9960f66

Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
Lenka Trochtova [Wed, 11 Jan 2017 14:59:18 +0000 (14:59 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
am: 345362c66f

Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6

7 years agoMerge "Clean up starting window to prepare for saved surfaces"
Jorim Jaggi [Wed, 11 Jan 2017 14:58:47 +0000 (14:58 +0000)]
Merge "Clean up starting window to prepare for saved surfaces"

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code"
Neil Fuller [Wed, 11 Jan 2017 14:54:51 +0000 (14:54 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"
am: 216303cdb6

Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
Lenka Trochtova [Wed, 11 Jan 2017 14:49:09 +0000 (14:49 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am: 0c1a4b6a97

Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code"
Neil Fuller [Wed, 11 Jan 2017 14:46:46 +0000 (14:46 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"

7 years agoFixes for FlashlightTile lifecycle
Jason Monk [Wed, 11 Jan 2017 14:41:05 +0000 (09:41 -0500)]
Fixes for FlashlightTile lifecycle

Change-Id: I690440465ef5312d77a279e73eaa22ccbdfbcd53
Fixes: 33861261
Test: runtest systemui

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
Treehugger Robot [Wed, 11 Jan 2017 14:40:05 +0000 (14:40 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."

7 years agoLock work tasks from SystemUI instead of ActivityStarter
Robin Lee [Tue, 10 Jan 2017 17:02:34 +0000 (17:02 +0000)]
Lock work tasks from SystemUI instead of ActivityStarter

By adding an onTaskProfileLocked(taskId, userId) RPC to
TaskStackListener and routing that through to a new WorkLockController.

Bug: 31001762
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest
Change-Id: I3fd28e6926c3f928e78b3c6ce0fe27413617695f

7 years agoBounce work challenge through a WorkLockActivity
Robin Lee [Tue, 20 Dec 2016 14:50:13 +0000 (14:50 +0000)]
Bounce work challenge through a WorkLockActivity

This stops us from depending on Settings for keeping the work profile
secure. Instead that is delegated to a smaller Activity inside SystemUI
which has just two jobs:

 1) Don't let anyone see the content that's supposed to be locked.

 2) Start ConfirmCredentialsActivity (still lives in Settings for now)

Bug: 31001762
Test: //cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest#testResetPasswordFbe
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest
Change-Id: If43820b683007a60a37edf32fb65b442a8fb709b

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am...
Neil Fuller [Wed, 11 Jan 2017 13:54:10 +0000 (13:54 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794
am: 43d53395dc

Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
Neil Fuller [Wed, 11 Jan 2017 13:48:14 +0000 (13:48 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
am: f4e236c794

Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14

7 years agoAdd ticker text for network logging notification
phweiss [Tue, 10 Jan 2017 18:31:07 +0000 (19:31 +0100)]
Add ticker text for network logging notification

Set ticker text to title for accessibility.

Bug:31207965
Test: manual

Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Neil Fuller [Wed, 11 Jan 2017 13:37:37 +0000 (13:37 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
am: 649a89e524

Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Neil Fuller [Wed, 11 Jan 2017 13:27:09 +0000 (13:27 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d...
Richard Uhler [Wed, 11 Jan 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd
am: 4911e517ab

Change-Id: I5fd04eb1e91d4ff590a195598566a85bbc00999f

7 years agoMerge "Update active fingerprint group when switching profiles"
Rubin Xu [Wed, 11 Jan 2017 10:56:21 +0000 (10:56 +0000)]
Merge "Update active fingerprint group when switching profiles"

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d
Richard Uhler [Wed, 11 Jan 2017 10:48:00 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d
am: 5c5637e1bd

Change-Id: I27f00cca9b511d6950e12b59f179faae21f07147

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Richard Uhler [Wed, 11 Jan 2017 10:37:33 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am: 8582826f8d

Change-Id: If5d55f55d86c4e4711e36a7f517336fbdda96e3d

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
Erik Kline [Wed, 11 Jan 2017 08:48:33 +0000 (08:48 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
am: 305796276b

Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98

7 years agoCleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Richard Uhler [Thu, 8 Dec 2016 10:33:09 +0000 (10:33 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.

Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug: 33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
Erik Kline [Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
am: d48902d37e

Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Wed, 11 Jan 2017 08:38:00 +0000 (08:38 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
am: f84e5e8f76

Change-Id: I4e4d525ff1dc23189e4ef6978a1980319d6b85f2

7 years agoFix typo that caused excessive display config updates
Andrii Kulian [Wed, 11 Jan 2017 06:57:27 +0000 (22:57 -0800)]
Fix typo that caused excessive display config updates

Applied incorrect configuration object while doing original
configuration refactoring.

Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Test: #testDisplayOverrideConfigUpdate
Change-Id: Ief5979feebb50f689b6cb532e1dba93e47dcbc40

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Wed, 11 Jan 2017 08:29:17 +0000 (08:29 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"

7 years agoMerge "Introduce full justification."
Seigo Nonaka [Wed, 11 Jan 2017 08:24:06 +0000 (08:24 +0000)]
Merge "Introduce full justification."

7 years agoMerge "Require InputContentInfo.requestPermission()"
TreeHugger Robot [Wed, 11 Jan 2017 06:30:20 +0000 (06:30 +0000)]
Merge "Require InputContentInfo.requestPermission()"

7 years agoMerge "Fix calculation of duration in AnimationSet"
David Stevens [Wed, 11 Jan 2017 05:36:22 +0000 (05:36 +0000)]
Merge "Fix calculation of duration in AnimationSet"

7 years agoMerge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1 am: e4cff36099
Andreas Gampe [Wed, 11 Jan 2017 04:53:19 +0000 (04:53 +0000)]
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1 am: e4cff36099
am: 3b51506c5c

Change-Id: I24e391d2cd7b9bff0808fc9355059b1b71bcba3e

7 years agoMerge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3...
Calin Juravle [Wed, 11 Jan 2017 04:50:28 +0000 (04:50 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3 am: 6d0b836562 am: 8ad84c5e70
am: 4b1548bd5a

Change-Id: I0aeb97b80a4d5b3eeb18c4a2ac7467c9035f700a