OSDN Git Service
Android Build Merger (Role) [Thu, 27 Jul 2017 18:45:32 +0000 (18:45 +0000)]
Merge "Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15 am:
62bb1e75ac am:
8071e11d87"
Maurice Lam [Thu, 27 Jul 2017 18:45:25 +0000 (18:45 +0000)]
Merge "Raise CHAR LIMIT and update description"
Jian Zhou [Thu, 27 Jul 2017 18:45:20 +0000 (18:45 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15 am:
62bb1e75ac
am:
8071e11d87
Change-Id: I60ffd8a6328b64952176c91922411000e86a9d31
Ryusuke Sawa [Thu, 27 Jul 2017 18:44:55 +0000 (18:44 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f am:
6b46a9df49 am:
775c1c8eb5
am:
653ef15253
Change-Id: I4b48899bd33466742cbe3bf93d9b5fe01d4472ea
jackqdyulei [Thu, 27 Jul 2017 18:44:26 +0000 (18:44 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a am:
16afa828c7
am:
9b6a6e903d
Change-Id: I7705b7a64bfd8487d9e2d00ad1eba293ec8f096a
Jian Zhou [Thu, 27 Jul 2017 18:29:03 +0000 (18:29 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15
am:
62bb1e75ac
Change-Id: I9dc6da68107514e839b4284a4aeab47f43f745e6
Ryusuke Sawa [Thu, 27 Jul 2017 18:28:17 +0000 (18:28 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f am:
6b46a9df49
am:
775c1c8eb5
Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
Jian Zhou [Thu, 27 Jul 2017 18:26:35 +0000 (18:26 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0
am:
86535a3d15
Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
jackqdyulei [Thu, 27 Jul 2017 18:26:24 +0000 (18:26 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a
am:
16afa828c7
Change-Id: I16bcd80c82ed42f65b1490f1f8189e5e55844688
Ryusuke Sawa [Thu, 27 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f
am:
6b46a9df49
Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
Jian Zhou [Thu, 27 Jul 2017 18:24:10 +0000 (18:24 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb
am:
3aee5e1ad0
Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5
Ryusuke Sawa [Thu, 27 Jul 2017 18:23:51 +0000 (18:23 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a
am:
b0e008841f
Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d
Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am:
41b4d908bb
Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Show Error dialog when WPS is interrupted"
am:
fd7dec5d4a
Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am:
4ab4966e7a
Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
Soroosh Mariooryad [Thu, 27 Jul 2017 18:16:21 +0000 (18:16 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
6f0e9273f8" into oc-mr1-dev-plus-aosp
am:
f0184bbc35
Change-Id: Ib1938fb8d3cc5f6b6862a0fee7b5fc2cd124ecff
Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
TreeHugger Robot [Thu, 27 Jul 2017 18:15:55 +0000 (18:15 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
Treehugger Robot [Thu, 27 Jul 2017 18:15:35 +0000 (18:15 +0000)]
Merge "Show Error dialog when WPS is interrupted"
Soroosh Mariooryad [Thu, 27 Jul 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
e993ab19fc" into oc-mr1-dev-plus-aosp
am:
9c08a6cb1b
Change-Id: Ie975d26e4624a504f94ee2b633479e648012cbc9
jackqdyulei [Thu, 27 Jul 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev am:
ea7c30265c
am:
339c6ac7c2
Change-Id: I79b0f0eb4032260b73e8b4fe3ec4f741dbeb2e1e
Android Build Merger (Role) [Thu, 27 Jul 2017 17:57:20 +0000 (17:57 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
6f0e9273f8" into oc-mr1-dev-plus-aosp
Soroosh Mariooryad [Thu, 27 Jul 2017 17:57:04 +0000 (17:57 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0
am:
6f0e9273f8
Change-Id: I567e41b2754bbf2af7295ce3443cb0be2aa90411
Android Build Merger (Role) [Thu, 27 Jul 2017 17:57:03 +0000 (17:57 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
e993ab19fc" into oc-mr1-dev-plus-aosp
jackqdyulei [Thu, 27 Jul 2017 17:56:44 +0000 (17:56 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
am:
ea7c30265c
Change-Id: Ice74f01d0e7a4e5675383a5abe89d0b3ccab4de7
Soroosh Mariooryad [Thu, 27 Jul 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0
am:
e993ab19fc
Change-Id: I5903157a27f97ac1d8f429978b400d7f22428f28
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am:
c3bb4cd8c0
Change-Id: Ia59839d3b952420390896d06c030905853df92e7
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:46 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am:
c3bb4cd8c0
Change-Id: Iad0b750eaaee29a41be6514cc29d521bc899b71a
TreeHugger Robot [Thu, 27 Jul 2017 17:53:54 +0000 (17:53 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:39:04 +0000 (17:39 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
Julia Reynolds [Thu, 27 Jul 2017 12:48:44 +0000 (12:48 +0000)]
Merge "Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5 am:
698ce72bc2" into oc-mr1-dev-plus-aosp
am:
7808d07be0
Change-Id: Iaef740b035f9181313430e7e0dbc35691bb6200d
Julia Reynolds [Thu, 27 Jul 2017 12:48:21 +0000 (12:48 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5 am:
d6ab7dee09
am:
81eb0697da
Change-Id: I844a5066dabbe40161f1e10b5525458ddea49ce0
Android Build Merger (Role) [Thu, 27 Jul 2017 12:46:13 +0000 (12:46 +0000)]
Merge "Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5 am:
698ce72bc2" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 27 Jul 2017 12:45:52 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
698ce72bc2
Change-Id: I25c8649c4dbe40ccc721332b08f4a9b65332c0fd
Julia Reynolds [Thu, 27 Jul 2017 12:45:50 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
d6ab7dee09
Change-Id: Ic8517b370329586cad908283d94928f1b8c3c308
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
TreeHugger Robot [Thu, 27 Jul 2017 12:36:55 +0000 (12:36 +0000)]
Merge "Revert string change" into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 00:51:19 +0000 (17:51 -0700)]
Update suggestion ranking model coefficients.
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.
Test: RunSettingsRoboTests & also manually testing suggestions
Bug:
64093782
Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
Andrew Sapperstein [Thu, 27 Jul 2017 06:50:19 +0000 (06:50 +0000)]
Merge "Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours am:
97ca7e473a -s ours" into oc-mr1-dev-plus-aosp
am:
5bbef78325 -s ours
Change-Id: Ic75e9b51a56261cf8f386667a0cc55c411ee8473
Andrew Sapperstein [Thu, 27 Jul 2017 06:49:50 +0000 (06:49 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d am:
3b30cbee7d -s ours
am:
280e3cc0d7 -s ours
Change-Id: I2b8de97f515eeb8e3c8a4919482fd1700262c13c
Android Build Merger (Role) [Thu, 27 Jul 2017 05:44:43 +0000 (05:44 +0000)]
Merge "Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours am:
97ca7e473a -s ours" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours
am:
97ca7e473a -s ours
Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:25 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d
am:
3b30cbee7d -s ours
Change-Id: I979838abf7aa8a6b5e69bda495ca08edd6110f0d
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:58 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d
Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:56 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d -s ours
Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83
TreeHugger Robot [Thu, 27 Jul 2017 05:37:49 +0000 (05:37 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 05:32:37 +0000 (05:32 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
e3e1e7b9d4 -s ours am:
a9fc19e385 -s ours
am:
4baa6ce625 -s ours
Change-Id: I76cf979321b93327e2695cba6beba02f5c8df97d
Andrew Sapperstein [Thu, 27 Jul 2017 05:32:16 +0000 (05:32 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef am:
fe35c40dad
am:
b0b1bdd02b
Change-Id: I8d1c9b5a059b68e9cecfbe80151cfdd6ef4a6791
Bill Yi [Thu, 27 Jul 2017 05:31:51 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours am:
1602913a75 -s ours
am:
d8667dba08 -s ours
Change-Id: I5c0bb0b72d3004f10acf00e25a43bdcdbe09a72d
Matthew Fritze [Thu, 27 Jul 2017 05:31:26 +0000 (05:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e am:
9092e1a0b0
am:
ece8c7bfe7
Change-Id: I6528cb4f24562d66aa139dc76e522b75305f340a
jackqdyulei [Thu, 27 Jul 2017 05:30:58 +0000 (05:30 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92 am:
75e89dfede
am:
418bd11db3
Change-Id: I73a01ad35316be7c6d66f05ba312a5c432558d3b
Andrew Sapperstein [Thu, 27 Jul 2017 05:30:09 +0000 (05:30 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef am:
1ee62c16a3
am:
df916872c1
Change-Id: Ie842bc43d7af52f3b797eba63c2ec9e5fb886381
Bill Yi [Thu, 27 Jul 2017 05:29:41 +0000 (05:29 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours am:
ef36ef28d9 -s ours
am:
97bed117da -s ours
Change-Id: I50cf506341907c540c71718d933524735738cc4a
Matthew Fritze [Thu, 27 Jul 2017 05:29:20 +0000 (05:29 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e am:
68617a6f42
am:
cba96eb672
Change-Id: I0f6a9f3923c36553d4494a0fca00024abffb96e5
Doris Ling [Thu, 27 Jul 2017 05:28:52 +0000 (05:28 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am:
8e13218ec8
am:
e866cd4825
Change-Id: If482eb0f2229193145e2157ae76d09249e0c433b
jackqdyulei [Thu, 27 Jul 2017 05:28:27 +0000 (05:28 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92 am:
063e87c689
am:
220b1f163a
Change-Id: I9f1857004f87e659fdf807bb41cec18a69c60266
Andrew Sapperstein [Thu, 27 Jul 2017 05:27:57 +0000 (05:27 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev am:
5d7fab4f22
am:
8f25bc916a
Change-Id: Icdbd94d006b5c7bcc0251d657342ee6c90f7ef48
Bill Yi [Thu, 27 Jul 2017 02:15:58 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
e3e1e7b9d4 -s ours
am:
a9fc19e385 -s ours
Change-Id: Iaaa737d1fad0e56d13799452af97cd91c8266c94
Andrew Sapperstein [Thu, 27 Jul 2017 02:15:36 +0000 (02:15 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
fe35c40dad
Change-Id: I018aa267ca72d8b8c42fa6e0e39c5cc454fb4d20
Bill Yi [Thu, 27 Jul 2017 02:15:13 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
1602913a75 -s ours
Change-Id: Iad694020c5ab0c0e4105940da1cc1a0b3854c435
Matthew Fritze [Thu, 27 Jul 2017 02:14:54 +0000 (02:14 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
9092e1a0b0
Change-Id: I44bc5c7f3576eeba51913a8a852b6ecfc5f5fbd5
jackqdyulei [Thu, 27 Jul 2017 02:14:28 +0000 (02:14 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
75e89dfede
Change-Id: I718c78a47392273db4cff54abe6a2f80067f4d7e
Ryusuke Sawa [Fri, 19 Jul 2013 05:32:19 +0000 (14:32 +0900)]
Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.
Bug:
29883134
Test: manual - tap WPS Push Button and turn Airplane mode on
Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
Andrew Sapperstein [Thu, 27 Jul 2017 01:36:57 +0000 (01:36 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
1ee62c16a3
Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5
Bill Yi [Thu, 27 Jul 2017 01:36:32 +0000 (01:36 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
ef36ef28d9 -s ours
Change-Id: Iec10999409679807df916e04ca9413385c33093f
Matthew Fritze [Thu, 27 Jul 2017 01:35:04 +0000 (01:35 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
68617a6f42
Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419
Doris Ling [Thu, 27 Jul 2017 01:33:52 +0000 (01:33 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
am:
8e13218ec8
Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05
jackqdyulei [Thu, 27 Jul 2017 01:33:28 +0000 (01:33 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
063e87c689
Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
Andrew Sapperstein [Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am:
5d7fab4f22
Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef
Bill Yi [Thu, 27 Jul 2017 01:24:51 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
e3e1e7b9d4 -s ours
Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
Andrew Sapperstein [Thu, 27 Jul 2017 01:21:05 +0000 (01:21 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
Andrew Sapperstein [Thu, 27 Jul 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
Bill Yi [Thu, 27 Jul 2017 01:10:19 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
Matthew Fritze [Thu, 27 Jul 2017 01:09:55 +0000 (01:09 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
jackqdyulei [Tue, 25 Jul 2017 01:34:33 +0000 (18:34 -0700)]
Add ResultPayload for Allow notification dots
Bug:
62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]
Fix more config_headlineFontFamily-induced test breakages
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes:
64024743
Test: robotests
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am:
05185952c8 -s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
Ajay Nadathur [Wed, 26 Jul 2017 22:53:34 +0000 (22:53 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed am:
044485b850
am:
06a9a033a0
Change-Id: If6323b25f3678a9cb614d005d67e350746778987
Ajay Nadathur [Wed, 26 Jul 2017 22:53:03 +0000 (22:53 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed am:
3c308aef22
am:
03737f1c9c
Change-Id: Id274a3c6fb6374e6db459bea150984a85fd3e8ad
Bill Yi [Wed, 26 Jul 2017 22:52:25 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
975d9a18f1 -s ours
am:
fee1e54914 -s ours
Change-Id: If9d2805f0f3ba0d9bf9056923d5611dd50cf22cc
jackqdyulei [Wed, 26 Jul 2017 20:50:43 +0000 (13:50 -0700)]
Don't update the header when toggle menu
If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.
Bug:
64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba
Ajay Nadathur [Wed, 26 Jul 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
044485b850
Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5
Ajay Nadathur [Wed, 26 Jul 2017 22:16:46 +0000 (22:16 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
3c308aef22
Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822
Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:41:58 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
OSDN Git Service
