OSDN Git Service
Bill Yi [Wed, 2 Nov 2016 13:07:29 +0000 (13:07 +0000)]
Import translations. DO NOT MERGE am:
212cda9a9a -s ours
am:
e2dac2cd85 -s ours
Change-Id: I2ae406406b26f10c863eda8338e1c68da30754b7
Bill Yi [Wed, 2 Nov 2016 13:03:00 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
212cda9a9a -s ours
Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae
TreeHugger Robot [Wed, 2 Nov 2016 12:58:36 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 2 Nov 2016 12:56:18 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Hugo Benichi [Wed, 2 Nov 2016 12:35:45 +0000 (12:35 +0000)]
Merge "ApfTest: tag tests with @SmallTest or @MediumTest"
TreeHugger Robot [Wed, 2 Nov 2016 12:13:27 +0000 (12:13 +0000)]
Merge "Cross profile candidate should be considered"
TreeHugger Robot [Wed, 2 Nov 2016 10:35:25 +0000 (10:35 +0000)]
Merge "[DPM] DO can start network logging and listen for events"
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
Cross profile candidate should be considered
Bug:
32547783
Fixed the regression introduced in ag/
1243573
Test: Manual test - Open a map link in work calendar, personal map is shown as an option.
Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
Tony Mak [Tue, 1 Nov 2016 18:12:10 +0000 (18:12 +0000)]
Add javadoc for profileGroupId
According to the implementation of getProfileParent,
profileGroupId == parent user id.
And we have already assumed this is true in some part of code in DPMS.
Test: Javadocs change
Change-Id: Ie48fdf24fb0428d4ee3f09bed2ac26cb17e1ced9
Michal Karpinski [Wed, 12 Oct 2016 13:59:26 +0000 (14:59 +0100)]
[DPM] DO can start network logging and listen for events
This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).
Bug:
29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47
Bill Yi [Wed, 2 Nov 2016 06:30:37 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c811c3ef881581b47d410c916e43160e6d60a53
Auto-generated-cl: translation import
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.
Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.
Test: ApfTest passes ($runtest frameworks-net)
Bug:
31479480
Change-Id: Iae28fc30b6229a161388233c40863f38b902991d
TreeHugger Robot [Wed, 2 Nov 2016 05:18:26 +0000 (05:18 +0000)]
Merge "Add findPath method to MtpDocumentsProvider."
Daichi Hirono [Tue, 1 Nov 2016 09:41:43 +0000 (18:41 +0900)]
Add findPath method to MtpDocumentsProvider.
Bug:
32515515
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: Ib87e8f5258de8fd48a099adbf077b3b9ff85773c
Jorim Jaggi [Wed, 2 Nov 2016 02:14:12 +0000 (02:14 +0000)]
Merge changes from topic 'keyguard_refactor'
* changes:
The big keyguard transition refactor (6/n)
The big keyguard transition refactor (5/n)
The big keyguard transition refactor (4/n)
The big keyguard transition refactor (3/n)
The big keyguard transition refactor (2/n)
The big keyguard transition refactor (1/n)
Yorke Lee [Wed, 2 Nov 2016 01:38:49 +0000 (01:38 +0000)]
Merge "Add a config flag to control app transitions"
Sanket Agarwal [Wed, 2 Nov 2016 01:27:13 +0000 (01:27 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e am:
f41abccf80 am:
5e8b2e4110
am:
15c21c616e
Change-Id: I15a7590c66fed5061ead0046e0773454911a43aa
Joseph Pirozzo [Wed, 2 Nov 2016 01:26:01 +0000 (01:26 +0000)]
MAP MCE am:
b8fc0679e8 am:
b13240028b am:
5602b26f41
am:
132dab26e5
Change-Id: Icb6d7db9d0e1866b2c1847be2b1da0008bd8185d
Joseph Pirozzo [Wed, 2 Nov 2016 01:25:15 +0000 (01:25 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb am:
a31933abc3 am:
1c21f0378a
am:
89c1087162
Change-Id: I879ec1f919386efb433d21e2bc7088e3ed31f4ce
Joseph Pirozzo [Wed, 2 Nov 2016 01:24:14 +0000 (01:24 +0000)]
MAP MCE am:
631768d814 am:
d94c280a7f am:
c412914520
am:
fb70d77f64
Change-Id: Ia56f6ca01a4d92b24f192102917950a10b6cb05d
Julia Reynolds [Wed, 2 Nov 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Some channel model updates"
Sanket Agarwal [Wed, 2 Nov 2016 01:19:29 +0000 (01:19 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e am:
f41abccf80
am:
5e8b2e4110
Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6
Joseph Pirozzo [Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)]
MAP MCE am:
b8fc0679e8 am:
b13240028b
am:
5602b26f41
Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c
Joseph Pirozzo [Wed, 2 Nov 2016 01:17:45 +0000 (01:17 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb am:
a31933abc3
am:
1c21f0378a
Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96
Joseph Pirozzo [Wed, 2 Nov 2016 01:16:45 +0000 (01:16 +0000)]
MAP MCE am:
631768d814 am:
d94c280a7f
am:
c412914520
Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584
Sanket Agarwal [Wed, 2 Nov 2016 01:11:53 +0000 (01:11 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am:
cf4dc9236e
am:
f41abccf80
Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
Joseph Pirozzo [Wed, 2 Nov 2016 01:11:04 +0000 (01:11 +0000)]
MAP MCE am:
b8fc0679e8
am:
b13240028b
Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
Joseph Pirozzo [Wed, 2 Nov 2016 01:10:02 +0000 (01:10 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb
am:
a31933abc3
Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
Joseph Pirozzo [Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)]
MAP MCE am:
631768d814
am:
d94c280a7f
Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am:
cf4dc9236e
Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]
MAP MCE
am:
b8fc0679e8
Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
Joseph Pirozzo [Wed, 2 Nov 2016 01:04:33 +0000 (01:04 +0000)]
Pbap disconnect durring connect
am:
a4f0127fbb
Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
Joseph Pirozzo [Wed, 2 Nov 2016 01:03:51 +0000 (01:03 +0000)]
MAP MCE
am:
631768d814
Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
Bill Yi [Wed, 2 Nov 2016 00:57:21 +0000 (17:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief73e3fee1a3f44096c534437fd74b357a2dde8a
Auto-generated-cl: translation import
Sanket Agarwal [Wed, 2 Nov 2016 00:55:40 +0000 (00:55 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
* changes:
MAP MCE
Pbap disconnect durring connect
MAP MCE
Adrian Roos [Wed, 2 Nov 2016 00:54:46 +0000 (00:54 +0000)]
Merge "DozeService: Fixup nits from review"
Fyodor Kupolov [Wed, 2 Nov 2016 00:54:04 +0000 (00:54 +0000)]
Merge "Initialize daemon on a separate thread"
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:49:44 +0000 (00:49 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7 am:
4c65d49a92 am:
de915e3ade
am:
d771ca3871
Change-Id: I9bf6a015e90e3e259897ca0b4ff29c69e13feae6
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:44:47 +0000 (00:44 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7 am:
4c65d49a92
am:
de915e3ade
Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7
am:
4c65d49a92
Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
Joseph Pirozzo [Thu, 6 Oct 2016 18:44:53 +0000 (11:44 -0700)]
MAP MCE
Fix @LINK to @link in javadoc.
Bug:
30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit
f5fba751d360bbe8294c4640f5ad12a990f13122)
Joseph Pirozzo [Mon, 2 May 2016 14:30:21 +0000 (07:30 -0700)]
Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.
bug:
28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit
bdd24942e47811ffe6bb9814934e6b08a8190e7e)
Joseph Pirozzo [Thu, 1 Sep 2016 21:19:28 +0000 (14:19 -0700)]
MAP MCE
Add MAP client code into packages/apps/Bluetooth. Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).
Bug:
30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit
433b3054847951e8e7b3864d11990604a66b8651)
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:34:47 +0000 (00:34 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
am:
7f64c195f7
Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
TreeHugger Robot [Wed, 2 Nov 2016 00:29:22 +0000 (00:29 +0000)]
Merge "Revert "Exit enteringAccessoryMode when entered.""
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
Bill Yi [Wed, 2 Nov 2016 00:18:13 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1e32a6765f35a781a05e767a219399ec159fddc
Auto-generated-cl: translation import
Dianne Hackborn [Wed, 2 Nov 2016 00:11:26 +0000 (00:11 +0000)]
Merge "Switch am command to go through "cmd activity"."
Yorke Lee [Mon, 31 Oct 2016 19:31:06 +0000 (12:31 -0700)]
Add a config flag to control app transitions
Bug:
32289964
Test: Build and verify that app transitions still work
and can be controlled by overlay
Cherry-picked from I78e88c4e7d3c32493c11be451b0c5ca59f68be83
Change-Id: I78e88c4e7d3c32493c11be451b0c5ca59f68be83
Bryce Lee [Tue, 1 Nov 2016 23:34:48 +0000 (23:34 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6 am:
6f84631d8d am:
e07c4cb4e6
am:
7f60047cb4
Change-Id: Icaff5bab21f5a9a40f7c24b13e8579d390a373d9
Bryce Lee [Tue, 1 Nov 2016 23:29:16 +0000 (23:29 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6 am:
6f84631d8d
am:
e07c4cb4e6
Change-Id: I53a4a3df08b8bd169112d004f7fa6ab5495c15fe
TreeHugger Robot [Tue, 1 Nov 2016 23:28:14 +0000 (23:28 +0000)]
Merge "Removing forced layout when the window is translated."
Bryce Lee [Tue, 1 Nov 2016 23:24:42 +0000 (23:24 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6
am:
6f84631d8d
Change-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5
Bryce Lee [Tue, 1 Nov 2016 23:20:16 +0000 (23:20 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
am:
0a86c936a6
Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
Phil Weaver [Tue, 1 Nov 2016 23:17:15 +0000 (23:17 +0000)]
Don't invalidate list data during layout. am:
456158ffc2 am:
06ffff6132 am:
07f434d02f
am:
112345c1c3
Change-Id: I367cf7cb5e24d6f2c7724db4e6038830003e2029
vinodkrishnan [Tue, 1 Nov 2016 23:13:25 +0000 (23:13 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev am:
89e653ccc7 am:
2a569d1490
am:
f4f48fc5f9 -s ours
Change-Id: I434e3e403c96c46cb5f002ac96d33350d337a72f
Vinod Krishnan [Tue, 1 Nov 2016 23:12:36 +0000 (23:12 +0000)]
DO NOT MERGE Wear Fwk: Disable Animations for A11y am:
8500f26d51 am:
305187983b
am:
166b0ad28f -s ours
Change-Id: Ica85275f5ae09408da727821788c1d502eb47057
Treehugger Robot [Tue, 1 Nov 2016 23:12:21 +0000 (23:12 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
Phil Weaver [Tue, 1 Nov 2016 23:09:02 +0000 (23:09 +0000)]
Don't invalidate list data during layout. am:
456158ffc2 am:
06ffff6132
am:
07f434d02f
Change-Id: I6adaa881b70805d46d2425dd979609c6e99e11c9
vinodkrishnan [Tue, 1 Nov 2016 23:05:53 +0000 (23:05 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev am:
89e653ccc7
am:
2a569d1490
Change-Id: I6b3e73ca5ff71dbc22f4ee510fa944aaa7eb4464
Vinod Krishnan [Tue, 1 Nov 2016 23:04:59 +0000 (23:04 +0000)]
DO NOT MERGE Wear Fwk: Disable Animations for A11y am:
8500f26d51
am:
305187983b
Change-Id: Ifb4eea689ded623034d5f8aa3158c814620e9de9
Phil Weaver [Tue, 1 Nov 2016 22:59:27 +0000 (22:59 +0000)]
Don't invalidate list data during layout. am:
456158ffc2
am:
06ffff6132
Change-Id: I56cd58a077729b7a8fccb66aeea5e3d69cb2fcdf
vinodkrishnan [Tue, 1 Nov 2016 22:58:04 +0000 (22:58 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev
am:
89e653ccc7
Change-Id: Id38b4d4b7240ff3e241811d58e56c7cc732ce637
Vinod Krishnan [Tue, 1 Nov 2016 22:57:58 +0000 (22:57 +0000)]
DO NOT MERGE Wear Fwk: Disable Animations for A11y
am:
8500f26d51
Change-Id: I8bddbad4b8777a3fedac2f88717b48d00f596a8c
Phil Weaver [Tue, 1 Nov 2016 22:55:11 +0000 (22:55 +0000)]
Don't invalidate list data during layout.
am:
456158ffc2
Change-Id: I550b63d3fd6b5f451083627dc16f369729b1e1d7
vinodkrishnan [Tue, 1 Nov 2016 22:54:06 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Wear Fwk: Disable Animations for A11y" into cw-f-dev
Jorim Jaggi [Thu, 27 Oct 2016 02:08:36 +0000 (19:08 -0700)]
The big keyguard transition refactor (6/n)
Cleanup:
- Make sure all the state is nicely dumped.
- Remove some unused stuff.
- Fix a flicker when occluded -> unlocked
Bug:
32057734
Change-Id: Id87e26adccef740d608b325c2dc1f6db14dd4ec3
Jorim Jaggi [Thu, 27 Oct 2016 01:22:04 +0000 (18:22 -0700)]
The big keyguard transition refactor (5/n)
Also save surface for the home task, so unlocking to the homescreen
is as fast as before. Note that originally it was not possible to
save surface for home task because of artifacts when clicking the
home button. However, we added logic since then to disallow save
surface if it's a different intent, which is the case when pressing
the home button.
Also consolidate some relayout for less overhead.
Bug:
32057734
Change-Id: I53ede527cb1ff438001d4023ee3740283ee302ee
Jorim Jaggi [Thu, 27 Oct 2016 01:02:36 +0000 (18:02 -0700)]
The big keyguard transition refactor (4/n)
Nuke KeyguardScrim
Test: Kill SystemUI while lockscreen is showing, make sure nothing
is visible when being killed.
Bug:
32057734
Change-Id: I9f8d1e5a0e0f968460d8170627a849623c6a7245
Philip P. Moltmann [Tue, 1 Nov 2016 22:36:12 +0000 (22:36 +0000)]
Revert "Exit enteringAccessoryMode when entered."
This reverts commit
a025c8985887e3a6dd87ffcd74a7097b4cef327d.
Change-Id: I550583606444a2d79ec911adf5b14b8783b03286
Jorim Jaggi [Thu, 27 Oct 2016 00:43:56 +0000 (17:43 -0700)]
The big keyguard transition refactor (3/n)
Notify activity manager when dreaming showing state changed so
KeyguardController can update the occluded state when the device
is dreaming.
Test: Set dreaming while charging, wait until screen times out,
make sure that dream is occluding Keyguard.
Bug:
32057734
Change-Id: Ied6f485d9b4a1526cb4cd5f0701f86b1ea05830a
Bryce Lee [Sun, 9 Oct 2016 19:54:42 +0000 (12:54 -0700)]
Add a way to query for supported Bluetooth profiles.
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.
Bug:
26451648
Change-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34
(cherry picked from commit
b1301fa2849bafd6daa422281dc5200863bc761e)
Phil Weaver [Tue, 1 Nov 2016 22:02:07 +0000 (22:02 +0000)]
Merge "Fixing outdated Javadoc for getAccessibilityViewId"
Jorim Jaggi [Thu, 13 Oct 2016 12:33:27 +0000 (14:33 +0200)]
The big keyguard transition refactor (2/n)
Introduce UnknownVisibilityController, which keeps track of apps that
may or may not be visible when launching an activity behind Keyguard.
When Keyguard is occluded and we launch another activity, we don't
know whether we still have to keep Keyguard occluded until the app
has gone through the resume path and issued a relayout call to update
the Keyguard flags.
This class keeps track of that state and defers the app transition
until the unknown visibility of all apps is resolved.
Test:
1) Have an occluding activity that starts another occluding
activity, ensure that there is no flicker.
2) Have an occluding activity while the Keyguard is insecure, start
a DISMISS_KEYGUARD activity, ensure there is no flicker.
3) runtest frameworks-services -c com.android.server.wm.UnknownVisibilityControllerTest
Bug:
32057734
Change-Id: I5145b272722ab8c31dd7c5383286f5c9473e26a4
Winson Chung [Fri, 28 Oct 2016 21:33:32 +0000 (14:33 -0700)]
Removing forced layout when the window is translated.
Test: Manual, ensure that the accessibility focus is still visible on
a moved window (enable talkback, focus a view, then move the
window).
Change-Id: Ifd67afe355cac2f1df01ddd16f960282f4d36132
Jorim Jaggi [Thu, 13 Oct 2016 12:33:27 +0000 (14:33 +0200)]
The big keyguard transition refactor (1/n)
The heart of this change are two things:
1) Instead of using the force hide mechanism to hide windows behind
Keyguard, we actually make the activities invisible in activity manager.
2) When Keyguard is going away, we change the visibilities in activity
manager and run an app transition.
At the very core we move the responsibility of hiding activities to
ActivityStack, which checks whether Keyguard is showing, and then
hides all non-show-when-locked activities. For that, we need to check
whether any window of an activity has SHOW_WHEN_LOCKED set. We
introduce a callback from WM -> AM in case these Keyguard flags have
changed.
Furthermore, we decide whether to occlude Keyguard in KeyguardController,
which just checks whether the top activity has SHOW_WHEN_LOCKED set. When
this state changes, we prepare an occlude/unocclude app transition, and
in PWM we just inform the Keyguard about the animation so SysUI can play
along this animations in a mostly synchronized manner.
Since we now use an app transition when unlocking the phone, we get
lockscreen launch animations for free - window manager automatically
waits until the activity is drawn, or directly executes the transition
if there is nothing to animate. Thus, we can remove all the infrastructure
around "waitingForActivityDrawn".
The logic to show/hide non-app windows is moved to policy, and we add the
ability to run animations on non-app windows when executing an app
transition.
Test:
1) runtest frameworks-services -c com.android.server.wm.AppTransitionTests
2) Manually test unlocking Keyguard:
2a) Without security
2b) With security
2c) With security but trusted
2d) Portrait while activity behind is in landscape
3) Test launching things from Keyguard
3a) Without security
3b) With security
3c) Launch camera without security
3d) Launch camera with security
3e) Launch camera with securtiy and trusted
3f) Launch voice affordance
4) Set no notifications on lockscreen, drag down, make sure you get
the correct animation
5) Test clicking "emergency" on bouncer
5b) Test "Emergency info" on emergency dialer
5c) Test clicking edit button on emergency info, should show pattern on
Keyguard
Bug:
32057734
Change-Id: Icada03cca74d6a612c1f988845f4d4f601087558
Phil Weaver [Tue, 1 Nov 2016 20:12:48 +0000 (13:12 -0700)]
Fixing outdated Javadoc for getAccessibilityViewId
Test: N/A. Only changing comments.
Change-Id: I2e994c8df0bf71463858090345c3a96f85b7b706
Andrii Kulian [Tue, 1 Nov 2016 19:49:11 +0000 (19:49 +0000)]
Merge "Update SEND_CONFIGURATION message to use displayId param"
TreeHugger Robot [Tue, 1 Nov 2016 19:46:53 +0000 (19:46 +0000)]
Merge "Fixed typo."
Sergei Vasilinetc [Tue, 1 Nov 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Routine to upload hardware bitmaps"
Julia Reynolds [Tue, 25 Oct 2016 13:08:57 +0000 (09:08 -0400)]
Some channel model updates
- Apps cannot update their channel settings after creation.
- Importance is required when creating a channel.
- Some method name changes.
- Ranker can't modify fields a user has changed.
- High and Max importance mean the same thing.
- The default channel adopts app wide settings on creation.
- The default channel is limited to importance low once target api is post n mr1
unless the user changed it.
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/notification
Change-Id: I73c449a6abe6d709046de79c5c54339cb2edf0b8
Mark Renouf [Tue, 1 Nov 2016 19:29:42 +0000 (19:29 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev am:
1b6da1f928 am:
a0f2404725
am:
1bc74b53b3
Change-Id: Ic64d696ecece2387274417325cf53414d016fe8b
Mark Renouf [Tue, 1 Nov 2016 19:28:34 +0000 (19:28 +0000)]
Workaround for javac compilation issue of lambda code am:
e065f7c5a9 am:
6ce06e63a7
am:
72f59dd7cb
Change-Id: I603a1709e35ba1d34cdd6b8abe9fd981e59166c8
Mark Renouf [Tue, 1 Nov 2016 19:25:29 +0000 (19:25 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev am:
1b6da1f928
am:
a0f2404725
Change-Id: I13c96d992efcaf9b205032839840be4b03256c68
Mark Renouf [Tue, 1 Nov 2016 19:24:26 +0000 (19:24 +0000)]
Workaround for javac compilation issue of lambda code am:
e065f7c5a9
am:
6ce06e63a7
Change-Id: I9a43b4843667bdab5909765b1afa99c9f7b11053
Phil Weaver [Tue, 1 Nov 2016 19:20:48 +0000 (19:20 +0000)]
Merge "Don't invalidate list data during layout."
Mark Renouf [Tue, 1 Nov 2016 19:19:40 +0000 (19:19 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
am:
1b6da1f928
Change-Id: Id8bef52d6b5f45202217c303ad30302694dac3e4
Mark Renouf [Tue, 1 Nov 2016 19:19:28 +0000 (19:19 +0000)]
Workaround for javac compilation issue of lambda code
am:
e065f7c5a9
Change-Id: I247477c4155ddc154e7fe3f1057a767d1ab74336
Mark Renouf [Tue, 1 Nov 2016 19:13:40 +0000 (19:13 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
Bill Yi [Tue, 1 Nov 2016 18:40:25 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
dc359e7b8d -s ours am:
ea46f852a8 -s ours
am:
1c069cef57 -s ours
Change-Id: Ifcbbd22037eec5867a5e750b5a8f1fe23fe526ce
Bill Yi [Tue, 1 Nov 2016 18:39:28 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE am:
5ac1b67317 -s ours am:
49f81e3c88 -s ours
am:
797f837722 -s ours
Change-Id: Ia71df19f5844945bb624aeaeec2684488d558fe6
Phil Weaver [Tue, 1 Nov 2016 16:55:24 +0000 (09:55 -0700)]
Don't invalidate list data during layout.
When a FastScroller is enabled, we were invalidating the
list data during layout, which left the UI in a bad state.
Long-presses didn't work properly, and TalkBack touches
were impossible to perform.
Bug:
31160338
Test: Manually tested long pressing, and verified
that TalkBack now works with the TestActivity in ag/
1567328.
Change-Id: Iecd2d597259748a3ecbf5573950e565a0e9faa42
Bill Yi [Tue, 1 Nov 2016 18:33:35 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
dc359e7b8d -s ours
am:
ea46f852a8 -s ours
Change-Id: Iff4d29701c6e127938f310e52ed04f8ab6d2a8d7
Bill Yi [Tue, 1 Nov 2016 18:32:23 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am:
5ac1b67317 -s ours
am:
49f81e3c88 -s ours
Change-Id: I53e3ac253896d7829fe2066e34d1b8a83e0c50aa
Bill Yi [Tue, 1 Nov 2016 18:27:23 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
dc359e7b8d -s ours
Change-Id: Ibe9da8e0b11a98d3307eee2c7105e37c851e168b
Bill Yi [Tue, 1 Nov 2016 18:27:21 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am:
5ac1b67317 -s ours
Change-Id: Iebeff33fbc1d5c55a8b66bfda258ddb7658df7b7
TreeHugger Robot [Tue, 1 Nov 2016 18:21:45 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Dianne Hackborn [Tue, 18 Oct 2016 20:19:20 +0000 (13:19 -0700)]
Switch am command to go through "cmd activity".
For almost everything... except instrument, which still needs
to be run as the shell user so its UiAutomator callbacks
will work correctly (and not create security holes).
Test: manual
Change-Id: I2e62714a2d5b52501aa261b7e4d6b282b54a0027
Charles He [Tue, 1 Nov 2016 17:58:03 +0000 (17:58 +0000)]
Merge "Update API whitelist supported by parent profile"
Mark Renouf [Tue, 1 Nov 2016 15:48:24 +0000 (11:48 -0400)]
Workaround for javac compilation issue of lambda code
Since ag/
32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:
> ShortcutService.java:408: error: variable ri might not have been initialized
https://android-build.googleplex.com/builds/submitted/
3416256/angelfish-userdebug/latest/logs
Removing the lambda expressions corrects the issue.
BUG:
32554459
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a