OSDN Git Service
Sungsoo Lim [Wed, 26 Jul 2017 18:54:19 +0000 (18:54 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am:
bba60fadc7
Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102
Sungsoo [Wed, 26 Jul 2017 18:51:16 +0000 (18:51 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am:
d7ff18dac8
Change-Id: I52a17de61821c72e97336eb66f34a56444e13894
Bill Yi [Wed, 26 Jul 2017 18:47:26 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b978569fce -s ours
Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59
TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:52:38 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
900d7157c0 -s ours
Change-Id: I755f5b84aa8444d48a7c1c34db9ae5d70a9b7aa9
Bill Yi [Wed, 26 Jul 2017 17:35:27 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
56b37be1c9 -s ours
Change-Id: Iae044e0aa00c834d4ba2a326eab390ff820bd907
Bill Yi [Wed, 26 Jul 2017 17:31:35 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2a2845a483 -s ours
Change-Id: Icdcd43fdc8d15c24c38752005e6ef249913c3125
TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 16:57:06 +0000 (16:57 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am:
afda883f86
Change-Id: Ifc073571a999d5c99a2f4b364691b15e070bf95f
TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 16:39:56 +0000 (16:39 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
Beverly [Wed, 26 Jul 2017 15:43:34 +0000 (15:43 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am:
382644aa74
Change-Id: I024b10373afa5dfd7255d0dccddb1bb653d496b4
TreeHugger Robot [Wed, 26 Jul 2017 15:34:32 +0000 (15:34 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
Geoffrey Pitsch [Wed, 26 Jul 2017 14:39:17 +0000 (14:39 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am:
0d5c1490ce
Change-Id: Iff93082f1d38becfc498fd7ba0d417ed88955c25
Geoffrey Pitsch [Wed, 26 Jul 2017 14:31:23 +0000 (14:31 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 14:30:33 +0000 (07:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3879f9882a8fde1edcc669f31b4cb5125786ea5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:27:44 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76674f28e858f631f43f88f041ce0b6798b30def
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Geoffrey Pitsch [Mon, 24 Jul 2017 15:24:21 +0000 (11:24 -0400)]
Remove ability to downgrade importance of existing channel.
Test: runtest systemui-notification
Bug:
63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215
Bill Yi [Wed, 26 Jul 2017 14:26:35 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5232ba3964ba77e81d70d325f34630a153d2b22d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bryce Lee [Wed, 26 Jul 2017 14:26:18 +0000 (14:26 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am:
512e5d1b9b
Change-Id: I2853f3545e7250d2d6f0a17399e4073c83d431a7
Bill Yi [Wed, 26 Jul 2017 14:25:10 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddda7b19049b1fc773e56eada5c4100ae14b39da
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bryce Lee [Wed, 26 Jul 2017 14:20:31 +0000 (14:20 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 11:53:34 +0000 (11:53 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am:
dd22dcbcdf
Change-Id: I2760a5efce65ba88fcb49589eec9071fc052ddc9
Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
Antony Sargent [Wed, 26 Jul 2017 11:02:16 +0000 (11:02 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am:
1e74fdb684
Change-Id: I0ccabd7441257ae1631ad8b362b64be37cf1a386
TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
4d00a9512a -s ours
Change-Id: I30da215979e10c5ea3ad63cc24c46dfe1a0a9ceb
Android Build Merger (Role) [Wed, 26 Jul 2017 08:21:12 +0000 (08:21 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 26 Jul 2017 08:20:16 +0000 (08:20 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours am:
799144a18b -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:19:41 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
0ad45f6f76 -s ours
Change-Id: I95efa84b8030ee19fd38e900466dadf0348cb309
Bill Yi [Wed, 26 Jul 2017 08:18:47 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
799144a18b -s ours
Change-Id: I01e221dcc0d669bc37882e5b15bfcd0c305725c5
Bill Yi [Wed, 26 Jul 2017 08:17:46 +0000 (08:17 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
090feca7b5 -s ours
Change-Id: I393ed981f7f52e9ac81f8aac11c3f4108ce681e4
Bill Yi [Wed, 26 Jul 2017 08:14:11 +0000 (08:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
5bbc5fe521 -s ours
Change-Id: I43cb6a9c7ea06c02575a53816cd649c6e0a4c2c2
Bill Yi [Wed, 26 Jul 2017 08:12:15 +0000 (08:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a7f60741ae -s ours
Change-Id: I30a22e1c267bc9e8bd287c48410cf9c475abdde0
Bill Yi [Wed, 26 Jul 2017 08:11:42 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a7f60741ae -s ours
Change-Id: If5dcfdf1c84371d86aeb37df131d10605808ad61
Bill Yi [Wed, 26 Jul 2017 08:11:41 +0000 (08:11 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
dcb5e77673 -s ours
Change-Id: I2f04880b253b79e28dceeb48237dd612b720fdba
Bill Yi [Wed, 26 Jul 2017 08:07:22 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I8421a6ad828df9c491665144533931352a6196f1
Bill Yi [Wed, 26 Jul 2017 08:03:38 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I9711ab0a99f2309c7e61e3548d7a16f3e555d166
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 08:02:03 +0000 (08:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I5c909bf0c13581379f08f21394c1c3221944c93e
Bill Yi [Wed, 26 Jul 2017 07:59:43 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I229f14aa24ced413b14247e372f6d94974fba315
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Antony Sargent [Tue, 18 Jul 2017 22:28:46 +0000 (15:28 -0700)]
@Keep all the things in TestAccessPointBuilder
The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.
Bug:
33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I22b7e9fa54fcd67e0f754aca47907d87db9d7056
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
Roozbeh Pournader [Wed, 26 Jul 2017 05:53:38 +0000 (05:53 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
am:
4fc156c451
Change-Id: Ib519d557c3b7c7bfad10e40553c5a8cabe4d7ea1
Chet Haase [Wed, 26 Jul 2017 05:47:46 +0000 (05:47 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
am:
1c31f9653f
Change-Id: I206f0394e523c69bf74df51ad4b9779020714626
Roozbeh Pournader [Wed, 26 Jul 2017 05:44:41 +0000 (05:44 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
Chet Haase [Wed, 26 Jul 2017 05:40:41 +0000 (05:40 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
Chet Haase [Fri, 21 Jul 2017 17:45:31 +0000 (10:45 -0700)]
Update overscroll and toast UI
Overscroll updates:
Same shape, but smaller radius (doesn't come as far into the view)
and more translucent (max 15% instead of 50%). Overall, more subtle.
Toast updates:
Light background, smaller, dark font, closer to the bottom of the
container.
Test: manual unit tests. Also:
cts test ToastTest for toast changes
cts test EdgeEffectTests for EdgeEffect changes (adding some tests to
known-failures for now, due to brittle golden-image failures - see
CL ag/
2596621)
Bug:
30563264 Refresh toast visuals for Android ODR
Bug:
63010438 Tweaks to overscroll animation
Change-Id: I0fac6322b0b81d030c8d174852c134211290bbea
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Winson Chung [Wed, 26 Jul 2017 04:09:05 +0000 (04:09 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am:
e31847642c
Change-Id: Ida93e02bae4e099ae20d2db7bd0d3efb774a546c
Winson Chung [Wed, 26 Jul 2017 04:01:48 +0000 (04:01 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
Christine Franks [Wed, 26 Jul 2017 02:52:59 +0000 (02:52 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am:
bdaada0af9
Change-Id: I603e609a6068e53f270eafefcf56dcaa496db12a
Philip Quinn [Wed, 26 Jul 2017 02:44:56 +0000 (02:44 +0000)]
Don't block the input thread to notify the StatusBar about key events.
am:
4b5b3c6ccc
Change-Id: Ie5e9f5a71b49c7eca1d646d72680998aef39f69c
Christine Franks [Wed, 26 Jul 2017 02:39:09 +0000 (02:39 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
Philip Quinn [Fri, 21 Jul 2017 04:07:58 +0000 (21:07 -0700)]
Don't block the input thread to notify the StatusBar about key events.
Also, give it a ping for volume key events.
Bug:
63183852
Bug:
63909062
Test: runtest systemui
Change-Id: I3e8507ad8fc23cf3078313b500b5012afc84fa07
Lucas Dupin [Wed, 26 Jul 2017 02:30:25 +0000 (02:30 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
am:
59aadea809
Change-Id: I14947611e687399221701b82401fd0efcee09e11
Kevin Chyn [Wed, 26 Jul 2017 02:28:11 +0000 (02:28 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am:
192e7ccf45
Change-Id: I22f3e2968a724bd6c63b5f9696d1115d571efaf8
TreeHugger Robot [Wed, 26 Jul 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 02:16:55 +0000 (02:16 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
Sungsoo Lim [Tue, 25 Jul 2017 00:09:03 +0000 (09:09 +0900)]
Fix NPE in MediaRouterService
Bug:
63970300
Test: manual and passed MediaRouterTest
Change-Id: I2e8d09d16ca8693b1bdf51397ad4f10c4aa6d87b
(cherry picked from commit
2d36ae9d2f2e286c205adb20af23eebe554f3dd8)
Sungsoo [Mon, 22 May 2017 08:10:44 +0000 (17:10 +0900)]
Restore the selected route when an app starts to make sound
Limitation: When two apps make sound simultaneously while one uses a BT
route and the other uses the default route, switching activities between
the two different apps will not change the BT A2DP status until one of
the apps changes its playback status to inactive.
Bug:
32958908, Bug:
35567695, Bug:
33186346
Test: Passed MediaRouter/MediaSession test, and manually varified that
the b/
33186346 is fixed.
Change-Id: I1da97dcb74fa2095425b311ad62cdd00f8118cea
(cherry picked from commit
b3658569e9a87afe1b3168837cc282235fd4d1f8)
George Burgess IV [Wed, 26 Jul 2017 00:50:07 +0000 (00:50 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb am:
20674ac1eb
am:
b759691046
Change-Id: I6cc8b3e3e610e12e0df592b615556c5b8b1e45ea
George Burgess IV [Wed, 26 Jul 2017 00:37:03 +0000 (00:37 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb
am:
20674ac1eb
Change-Id: I0f0efff718ae96adcc30ef6554aaccc96da66b0a
George Burgess IV [Wed, 26 Jul 2017 00:26:12 +0000 (00:26 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
am:
f44ebf5fcb
Change-Id: Ic0b97fb0689b4d322aa6ed25fe55ec192bff07a5
Christine Franks [Wed, 26 Jul 2017 00:16:28 +0000 (00:16 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am:
4ac942f140
Change-Id: I3d09e6fe436ae1ced8f9ed88e919f1d9bb5e52db
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
Christine Franks [Wed, 26 Jul 2017 00:07:14 +0000 (00:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
Lucas Dupin [Tue, 25 Jul 2017 00:44:25 +0000 (17:44 -0700)]
Themable volume and power dialogs
Test: visual
Bug:
63903361
Change-Id: I3e4dc74e960f212985712120341d3a80543c96db
Roozbeh Pournader [Tue, 25 Jul 2017 23:29:22 +0000 (16:29 -0700)]
Remove Kwasio (nmg) from user-selectable languages
The language had inadequate locale data, and even the name
of the Kwasio language itself was not localized to Kwasio.
Change-Id: I7b92460b7b3d736593db4a2f94d47863264561b4
Fixes:
64037672
Test: Manual (Kwasio, as 'Nmg', is no longer listed in Settings)
Jason Monk [Tue, 25 Jul 2017 23:10:19 +0000 (23:10 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
am:
18cb24ba33
Change-Id: If7eb6deae9f07417adc22f7db6b633d6bf90de35
Selim Cinek [Tue, 25 Jul 2017 23:04:53 +0000 (23:04 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
am:
e06e3f97fc
Change-Id: I667f1ec67a02c5ae264115a5b8bbe06dedda1d34
Sundeep Ghuman [Tue, 25 Jul 2017 23:00:52 +0000 (23:00 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
am:
d68b6dc56b
Change-Id: Ia68f4a742afbc88691d3e47760591a454f2f75cf
TreeHugger Robot [Tue, 25 Jul 2017 22:55:08 +0000 (22:55 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
Selim Cinek [Tue, 25 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
Jason Monk [Tue, 25 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
am:
bad473d147
Change-Id: I53e7eb19311160c18ec28b43d5ba0534890bda84
TreeHugger Robot [Tue, 25 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
George Burgess IV [Tue, 25 Jul 2017 21:22:07 +0000 (14:22 -0700)]
Silence a memory leak warning from the static analyzer
The analyzer assumes that the given `put` operation may fail. This
shouldn't be the case, so mark it with a LOG_ALWAYS_FATAL_IF. Doing so
silences a warning about potential memory leaks originating from
TessellationCache::getRoundRect.
Bug:
27101951
Test: mma. Warning is gone.
Change-Id: I3adeacd6c2c9c03caecd989e2a1267c51e8ef905
Winson Chung [Tue, 25 Jul 2017 21:28:03 +0000 (14:28 -0700)]
Ensure that we timeout waiting when starting the PiP menu activity
- In some cases we don't get notified when the menu activity start is
interrupted. In such a case, we should timeout and allow for the next
menu activity start to complete, and log the issue.
Bug:
63752800
Test: Artificially induce missed callback, ensure that we can still
launch the PiP activity afterwards.
Change-Id: Id92890a53ce47c4e9f593a5434fd8f9137468799
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
DO NOT MERGE - Remove RetailDemoModeServiceInternal
Bug:
62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
Makoto Onuki [Tue, 25 Jul 2017 20:57:23 +0000 (20:57 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am:
906d8f57bf
Change-Id: I38c6c3342423ab846546737e59fef45ad6370728
TreeHugger Robot [Tue, 25 Jul 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
Bill Yi [Tue, 25 Jul 2017 20:22:52 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
edfb7279ee -s ours
Change-Id: I164c306865f978a01df0f720859ecec73e3a5e56
TreeHugger Robot [Tue, 25 Jul 2017 20:11:16 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 25 Jul 2017 19:48:29 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f969869726 -s ours
Change-Id: I92788b202a09e95ae283553f93f81b8e697b4f41
Jason Monk [Tue, 25 Jul 2017 19:46:33 +0000 (15:46 -0400)]
Fix RTL for Nav icons
Test: manual
Change-Id: I972641fc8d122ce9f6d4204398559b11a36a4a40
Fixes:
63644656
TreeHugger Robot [Tue, 25 Jul 2017 19:35:43 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Winson Chung [Tue, 25 Jul 2017 19:32:31 +0000 (19:32 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
am:
cb9f6de368
Change-Id: Idf9d24e12bac0faf655994733b8b857ad0a510b4
Winson Chung [Tue, 25 Jul 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
Alison Cichowlas [Tue, 25 Jul 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
am:
5110b31dda
Change-Id: I10a45b9636f27407dbab280da440f33545e0fdca
TreeHugger Robot [Tue, 25 Jul 2017 19:03:35 +0000 (19:03 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
Jason Monk [Tue, 25 Jul 2017 18:44:28 +0000 (14:44 -0400)]
Add confirmation dialog when turning off cell data from QS
Test: manual
Change-Id: I1956750700c8fa2bf0e715b5ec92cf10fa3e9486
Fixes:
36436115
Andrew Sapperstein [Tue, 25 Jul 2017 18:27:01 +0000 (18:27 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
am:
b63b011419
Change-Id: I98ef598ca3260328cb65f2c619767acb61759a14
Bryce Lee [Tue, 25 Jul 2017 17:48:42 +0000 (10:48 -0700)]
Do not report app bound differences as a Configuration change.
App bounds are an internal Configuration field and should not
influence the diff that determines whether the Configuration has
changed. This changelist ensures this by introducing a new flag that
is identified server side and filtered before informing the client
that the configuration has changed.
Change-Id: Ibf1387f73eaa9b39e6213e1a1109c4cd57554e7c
Fixes:
63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests#testAppBoundsConfigurationDiff
Test: go/wm-smoke
TreeHugger Robot [Tue, 25 Jul 2017 18:19:24 +0000 (18:19 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
OSDN Git Service
