OSDN Git Service
Bill Yi [Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2a2845a483 -s ours
am:
a93169837a -s ours
Change-Id: Iec4ce94d01d5f516541e795ee2eb740a495357f7
Adrian Roos [Wed, 26 Jul 2017 17:42:15 +0000 (17:42 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am:
afda883f86
am:
2638216c83
Change-Id: I6f3dfc0bf046db21c5728f553202f3320070be00
Beverly [Wed, 26 Jul 2017 17:39:26 +0000 (17:39 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev am:
382644aa74
am:
deb56eb3f5
Change-Id: If56248e5b335edd5bea547fd503106664b26bad5
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
Geoffrey Pitsch [Wed, 26 Jul 2017 17:31:19 +0000 (17:31 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev am:
0d5c1490ce
am:
d691f1a200
Change-Id: Ie137cb0decb3ed96d0f3a8d71f04e49446726d7a
Bryce Lee [Wed, 26 Jul 2017 17:24:22 +0000 (17:24 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev am:
512e5d1b9b
am:
d6a2ed194c
Change-Id: I8acdd035eaa935f1a86f76c814f4d6413adb37c8
Android Build Merger (Role) [Wed, 26 Jul 2017 17:17:25 +0000 (17:17 +0000)]
Merge "Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am:
afda883f86 am:
2168aff878" into oc-mr1-dev-plus-aosp
Adrian Roos [Wed, 26 Jul 2017 17:13:17 +0000 (17:13 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am:
dd22dcbcdf
am:
147966d7ae
Change-Id: Ic14166198d1b44b87335f78bdab41b802fc23156
Adrian Roos [Wed, 26 Jul 2017 17:12:54 +0000 (17:12 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am:
afda883f86
am:
2168aff878
Change-Id: Ie3d6006ad5f9f63793b1bf7a73abc401d333e0ed
Antony Sargent [Wed, 26 Jul 2017 17:08:56 +0000 (17:08 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev am:
1e74fdb684 -s ours
am:
31d0bcc321
Change-Id: I8b79fc3104b1f03b772376bf9fa02323a06e83c9
Adrian Roos [Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am:
afda883f86
Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282
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
Beverly [Wed, 26 Jul 2017 16:40:41 +0000 (16:40 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am:
382644aa74
Change-Id: I7c8bfab80e82d2841f43a75ce7fddc0b03cacc70
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 16:33:26 +0000 (16:33 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev am:
382644aa74
am:
0f29b29513
Change-Id: If9cdb4d701462ffb843bb071811e2dc3d227c9a2
Geoffrey Pitsch [Wed, 26 Jul 2017 16:30:46 +0000 (16:30 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev am:
0d5c1490ce
am:
b65450e135
Change-Id: I204c5d4080ceb4f87b2c3477f0eff4b7ee749eff
Geoffrey Pitsch [Wed, 26 Jul 2017 16:29:01 +0000 (16:29 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am:
0d5c1490ce
Change-Id: I130816097bc68d1978b035cb2cfb0a3c678f9291
Bryce Lee [Wed, 26 Jul 2017 16:25:40 +0000 (16:25 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am:
512e5d1b9b
Change-Id: If5c2ce81a92d751c3481d7613611b9373060f78a
Bryce Lee [Wed, 26 Jul 2017 16:25:01 +0000 (16:25 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev am:
512e5d1b9b
am:
a9ba9c3ed6
Change-Id: Iaa194f131f171d01854afdf4b07d7648c4f14964
Adrian Roos [Wed, 26 Jul 2017 16:22:52 +0000 (16:22 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am:
dd22dcbcdf
Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786
Adrian Roos [Wed, 26 Jul 2017 16:22:51 +0000 (16:22 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am:
dd22dcbcdf
am:
6b46beea25
Change-Id: I98a42a909b011b7a888a6b6dc52caa18e95340d3
Antony Sargent [Wed, 26 Jul 2017 16:18:51 +0000 (16:18 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev am:
1e74fdb684
am:
9975186ae5 -s ours
Change-Id: Ie3b841afe7b8729775ac3ec2be79eaa171cc8571
Antony Sargent [Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am:
1e74fdb684 -s ours
Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138
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: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
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
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
Android Build Merger (Role) [Wed, 26 Jul 2017 08:40:56 +0000 (08:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours am:
4d00a9512a -s ours am:
a6eed85c8b -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:39:04 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours am:
4d00a9512a -s ours
am:
a6eed85c8b -s ours
Change-Id: I166a966d6e8f5a12431cff29072af05e31f5e2cb
Bill Yi [Wed, 26 Jul 2017 08:38:59 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours am:
4d00a9512a -s ours
am:
059137469b -s ours
Change-Id: I58e641654abe46a6c3fcc53bf17138d341b8a393
Android Build Merger (Role) [Wed, 26 Jul 2017 08:35:43 +0000 (08:35 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp am:
eb5a73f4ec -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:33:51 +0000 (08:33 +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
am:
eb5a73f4ec -s ours
Change-Id: I48e9216bc9bf710e0fc0483d80b62387da1191df
Android Build Merger (Role) [Wed, 26 Jul 2017 08:33:23 +0000 (08:33 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours am:
799144a18b -s ours" into oc-dr1-dev-plus-aosp am:
8f148cdce4 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:31:39 +0000 (08:31 +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
am:
8f148cdce4 -s ours
Change-Id: Iedac6d64df4cb01b070abc9b277a2be66f4d2c80
Android Build Merger (Role) [Wed, 26 Jul 2017 08:31:07 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours am:
816a4d38de -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 26 Jul 2017 08:30:34 +0000 (08:30 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours am:
101cf38a40 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:29:10 +0000 (08:29 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours
am:
816a4d38de -s ours
Change-Id: I2ec52f9136d4a821a88211a1a8263d37098a9b22
Bill Yi [Wed, 26 Jul 2017 08:28:43 +0000 (08:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours
am:
101cf38a40 -s ours
Change-Id: I58d52127fe0103931071c261742186e1d2ca70ab
Android Build Merger (Role) [Wed, 26 Jul 2017 08:28:16 +0000 (08:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
5bbc5fe521 -s ours am:
b4b0c6acb4 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:26:17 +0000 (08:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
4d00a9512a -s ours
Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69
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
Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
5bbc5fe521 -s ours
am:
b4b0c6acb4 -s ours
Change-Id: I3cc6305086fb24b1d732288d2c8d7880dbd5a0ec
Bill Yi [Wed, 26 Jul 2017 08:25:11 +0000 (08:25 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours
am:
b56bbb9dcb -s ours
Change-Id: Ia861a78a5d71eea2afdddb4a4329383a2e2b3080
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:18:42 +0000 (08:18 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
dcb5e77673 -s ours
am:
af65d78745 -s ours
Change-Id: I2576170517dac2e196691edf3b8c7a6a55dcd79d
Bill Yi [Wed, 26 Jul 2017 08:18:10 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
0ad45f6f76 -s ours
Change-Id: If23b7854224ec5320d2f912686deb3da10d34efb
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:16:15 +0000 (08:16 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
090feca7b5 -s ours
Change-Id: I2b8ed5d538954b0d56aebea103ac863e985c15b6
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 06:08:06 +0000 (06:08 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev am:
4fc156c451
am:
a637513640
Change-Id: Ie3fdab8a3061ecbf4a2da628d15f9ae35d75aa5b
Roozbeh Pournader [Wed, 26 Jul 2017 06:03:42 +0000 (06:03 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev am:
4fc156c451
am:
6ea806cab7
Change-Id: Ieac30429e78a9035c33016506bbd8e70aa486375
Android Build Merger (Role) [Wed, 26 Jul 2017 06:00:24 +0000 (06:00 +0000)]
Merge "Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f am:
29e03e574b" into oc-mr1-dev-plus-aosp
Chet Haase [Wed, 26 Jul 2017 05:57:38 +0000 (05:57 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f
am:
29e03e574b
Change-Id: I0cea587c16ba49b593b1ed3ca59beb9bb9404105
Chet Haase [Wed, 26 Jul 2017 05:57:36 +0000 (05:57 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f
am:
36fa7f4eec
Change-Id: Ie3edd12921a1732781121ad89ed3661bb934a889
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
Roozbeh Pournader [Wed, 26 Jul 2017 05:53:34 +0000 (05:53 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
am:
4fc156c451
Change-Id: I84c82030ef8b0ff9b7da990d5ec1ffcda1984a30
Chet Haase [Wed, 26 Jul 2017 05:47:47 +0000 (05:47 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
am:
1c31f9653f
Change-Id: Ib76daf28d94791f0c525aa1dcc57939ac60050c9
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
Android Build Merger (Role) [Wed, 26 Jul 2017 04:18:55 +0000 (04:18 +0000)]
Merge "Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c am:
9d35a1ee6b" into oc-mr1-dev-plus-aosp
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
Winson Chung [Wed, 26 Jul 2017 04:16:33 +0000 (04:16 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c
am:
9d35a1ee6b
Change-Id: I87f0758cccc701d9da5c9eb753105f407bb2e461
Winson Chung [Wed, 26 Jul 2017 04:16:30 +0000 (04:16 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c
am:
7fb48a776d
Change-Id: Ic95cc72ccd03e2bb11b417331a0994f06000c9ac
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:09:03 +0000 (04:09 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am:
e31847642c
Change-Id: I0f0737b4407b9af27bf2012643786c718832d273
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
Eric Schwarzenbach [Wed, 26 Jul 2017 03:53:29 +0000 (03:53 +0000)]
Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
am:
c7886489ee
Change-Id: I18be4be9f92d841cf5579ecde4fd6b73c860ee93
Eric Schwarzenbach [Wed, 26 Jul 2017 03:51:02 +0000 (03:51 +0000)]
Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
am:
3b8ce7c6d7
Change-Id: I43772768b4fe58de3a6b4fa1af909ed06122f802
TreeHugger Robot [Wed, 26 Jul 2017 03:42:09 +0000 (03:42 +0000)]
Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 03:41:27 +0000 (03:41 +0000)]
Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:35:32 +0000 (03:35 +0000)]
Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
am:
cfb5d97c3f
Change-Id: I614791d2b37573eebfb0a1e5b6da6993267e0f62
Christine Franks [Wed, 26 Jul 2017 03:26:23 +0000 (03:26 +0000)]
Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:04:15 +0000 (03:04 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am:
bdaada0af9
am:
0caac28160
Change-Id: If27b4e737b93fd1452445fc2e3b9f84dfc621b25
Christine Franks [Wed, 26 Jul 2017 02:59:55 +0000 (02:59 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am:
bdaada0af9
am:
a9a5c9f017
Change-Id: I1e1d318334514e63092dfb56b8f9525468244472
OSDN Git Service
