OSDN Git Service
jackqdyulei [Mon, 31 Jul 2017 20:21:27 +0000 (20:21 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
b3a488c40c" into oc-mr1-dev-plus-aosp
am:
c3829cab9d
Change-Id: I64f2a3e4560fe7cab63deb194df0db1b8ddfa78b
jackqdyulei [Mon, 31 Jul 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
68af5f3a5d" into oc-mr1-dev-plus-aosp
am:
d8664d6cba
Change-Id: I73affa5a3fb146ac4ddc62a96b16b54a4554b224
jackqdyulei [Mon, 31 Jul 2017 20:20:20 +0000 (20:20 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev am:
8be9d6519f
am:
6399937d47
Change-Id: I54392bce57eb20c96e51ee5270cc19d4b8d2b933
Fan Zhang [Mon, 31 Jul 2017 20:20:00 +0000 (20:20 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev am:
48d54ff2f6
am:
1f0b09c924
Change-Id: I253da71b17e387c089b5fd3ee29fd4ac6597429d
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:26 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
b3a488c40c" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 31 Jul 2017 19:28:21 +0000 (19:28 +0000)]
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2 am:
68af5f3a5d" into oc-mr1-dev-plus-aosp
jackqdyulei [Mon, 31 Jul 2017 19:27:56 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
b3a488c40c
Change-Id: Iced9212fa792abc6d24c68e3177babb8c61b9bbb
jackqdyulei [Mon, 31 Jul 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am:
d6c9a8b5b2
am:
68af5f3a5d
Change-Id: I24a1e496688277428b680eaa0a66dd12e0eac3d3
jackqdyulei [Mon, 31 Jul 2017 19:27:34 +0000 (19:27 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
am:
8be9d6519f
Change-Id: I6755b14b62b9ec8958ce2aa7e99b3faa4fbb7aa7
Fan Zhang [Mon, 31 Jul 2017 19:27:13 +0000 (19:27 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
am:
48d54ff2f6
Change-Id: Ieb1c678c66781341c5ab703ed66412508006afe3
jackqdyulei [Mon, 31 Jul 2017 19:11:31 +0000 (19:11 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: I9dcac73b1360471f4357ef75201b49c6d5031033
jackqdyulei [Mon, 31 Jul 2017 19:08:31 +0000 (19:08 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
am:
d6c9a8b5b2
Change-Id: Id708356c38b10789974e35193c1d71dc0c9fdf34
TreeHugger Robot [Mon, 31 Jul 2017 18:58:22 +0000 (18:58 +0000)]
Merge "Use package from sipper if default is null" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Layout tweak for app action buttons" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:55:40 +0000 (18:55 +0000)]
Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev
Ajay Nadathur [Mon, 31 Jul 2017 18:34:29 +0000 (18:34 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev am:
9b89fb0080
am:
40c652b221
Change-Id: Ib966fa27205c8f07dafa02b8dcb61b37b99667fc
Ajay Nadathur [Mon, 31 Jul 2017 18:30:57 +0000 (18:30 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
am:
9b89fb0080
Change-Id: I76719d69ebf0fa79e047da425de297422693f512
Ajay Nadathur [Mon, 31 Jul 2017 18:19:12 +0000 (18:19 +0000)]
Merge "Change vision settings suggestion title" into oc-mr1-dev
Maurice Lam [Mon, 31 Jul 2017 17:48:54 +0000 (17:48 +0000)]
Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
5faa5ab6ea" into oc-mr1-dev-plus-aosp
am:
1b032d9d39
Change-Id: I6436186aa68674d20537aefcbb5837a68fc73967
Maurice Lam [Mon, 31 Jul 2017 17:48:31 +0000 (17:48 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
7c5fc6737c
am:
d3c2026aae
Change-Id: I6a32995c441a6b48a0eecc9c98864e8504d7739c
Android Build Merger (Role) [Mon, 31 Jul 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356 am:
5faa5ab6ea" into oc-mr1-dev-plus-aosp
Maurice Lam [Mon, 31 Jul 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
5faa5ab6ea
Change-Id: Id18996a7427d2aedce6b24494e84adf5468dd496
Maurice Lam [Mon, 31 Jul 2017 17:44:35 +0000 (17:44 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev am:
5e2e0df356
am:
7c5fc6737c
Change-Id: Ic27b1772351d5e893b2c8ebd3ada4fe2a2bb1e20
Maurice Lam [Mon, 31 Jul 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617
Maurice Lam [Mon, 31 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
am:
5e2e0df356
Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3
Maurice Lam [Mon, 31 Jul 2017 17:35:07 +0000 (17:35 +0000)]
Merge "Align screen lock options to view start" into oc-dr1-dev
Pankaj Kanwar [Mon, 31 Jul 2017 17:16:21 +0000 (17:16 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev am:
492c9f4d16
am:
99dc2bf58e
Change-Id: I7ee1f292f89cf4a66e8813ac8ea7e3a2804d9310
Pankaj Kanwar [Mon, 31 Jul 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
am:
492c9f4d16
Change-Id: I3d05092be28d9fc527e882464e117837242143b3
Pankaj Kanwar [Mon, 31 Jul 2017 17:09:00 +0000 (17:09 +0000)]
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 15:13:24 +0000 (15:13 +0000)]
Merge "Update work briefcase asset."
Fan Zhang [Sat, 29 Jul 2017 00:24:36 +0000 (00:24 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3 am:
d58a499c02
am:
320680e817
Change-Id: Ice553b789170afa27e1149951746daf2e2bf3f8c
Fan Zhang [Sat, 29 Jul 2017 00:23:56 +0000 (00:23 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3 am:
4d5172bfeb
am:
e0dee98e12
Change-Id: Ia2fae5915d65ba1141a5d4e37fad544c0860d102
Fan Zhang [Sat, 29 Jul 2017 00:21:49 +0000 (00:21 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
d58a499c02
Change-Id: Ia15be666f61be4cb3a2ba503242343384b037484
Fan Zhang [Sat, 29 Jul 2017 00:20:50 +0000 (00:20 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev am:
b79d38f2f3
am:
4d5172bfeb
Change-Id: I8fec7ef3502df99ccf08731ad7a5547f13e643ea
Fan Zhang [Sat, 29 Jul 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: Idf6df51c8c2b4f765b370f70c8f427a261d4d1bb
Fan Zhang [Sat, 29 Jul 2017 00:16:22 +0000 (00:16 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
am:
b79d38f2f3
Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5
Fan Zhang [Sat, 29 Jul 2017 00:10:10 +0000 (00:10 +0000)]
Merge "Update search bar's navup content description" into oc-dr1-dev
pkanwar [Fri, 28 Jul 2017 22:56:22 +0000 (15:56 -0700)]
Add string needed to support carrier wifi in UI.
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.
Bug:
30988281
Test: manual
Change-Id: I6f3b6a047bb28fddf81ed967c89fac5824d34f9f
Fan Zhang [Fri, 21 Jul 2017 22:06:36 +0000 (15:06 -0700)]
Layout tweak for app action buttons
Now shadow is no longer cropped when pressing button
Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes:
62550425
Test: visual
(cherry picked from commit
ee308b950f5d4bc0312ed7f439ff02f9ef065d17)
Ajay Nadathur [Fri, 28 Jul 2017 21:24:39 +0000 (14:24 -0700)]
Change vision settings suggestion title
bug:
63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313
jackqdyulei [Thu, 27 Jul 2017 21:44:58 +0000 (14:44 -0700)]
Use package from sipper if default is null
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.
This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null
This cl is cherry picked from oc-dr to fix the test breakage.
Bug:
64127162
Test: RunSettingsRoboTests
Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
Lei Yu [Fri, 28 Jul 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
7cfaeeca58" into oc-mr1-dev-plus-aosp
am:
9848aafd79
Change-Id: Ifff392b8a0231731d32d131b024eaa32a4ec14a5
Lei Yu [Fri, 28 Jul 2017 20:57:18 +0000 (20:57 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
90db9083ad
am:
5711389270
Change-Id: Ifafa37160dddc8799fcbca61715df18f952e7ef5
Android Build Merger (Role) [Fri, 28 Jul 2017 20:54:05 +0000 (20:54 +0000)]
Merge "Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32 am:
7cfaeeca58" into oc-mr1-dev-plus-aosp
Lei Yu [Fri, 28 Jul 2017 20:53:47 +0000 (20:53 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32
am:
7cfaeeca58
Change-Id: I04315d3e4ff3bda720468f94940d8d11f76d01e0
Lei Yu [Fri, 28 Jul 2017 20:53:46 +0000 (20:53 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev am:
f940431d32
am:
90db9083ad
Change-Id: Ia08486adcf17e1747d0ea119eabd754dcc155dbc
Lei Yu [Fri, 28 Jul 2017 20:49:49 +0000 (20:49 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am:
f940431d32
Change-Id: I2e7ab9e29e9e2910c2405af287c3c46a927b3a1c
Lei Yu [Fri, 28 Jul 2017 20:49:48 +0000 (20:49 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
am:
f940431d32
Change-Id: I1d3672b40a0de6dfe481295134a5cb9eeea91b89
Lei Yu [Fri, 28 Jul 2017 20:39:57 +0000 (20:39 +0000)]
Merge "Turn off some anomaly detectors by default" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 23:13:03 +0000 (16:13 -0700)]
Create wrapper and shadow for AccessibilityManager
This is for testing, because robolectric doesn't recognize new
API.
Bug:
62022517
Test: Build
Change-Id: I1c150d86366305eacf3245bbabdf3d3e26124c77
Fan Zhang [Fri, 28 Jul 2017 19:39:19 +0000 (19:39 +0000)]
Merge "Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae am:
ae0dbe3e13" into oc-mr1-dev-plus-aosp
am:
4f1b9461fa
Change-Id: Id54aea464d3d129cd13bd2ecf88b3687d888a226
Fan Zhang [Fri, 28 Jul 2017 19:38:53 +0000 (19:38 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae am:
81840033e3
am:
7a07f68794
Change-Id: Ib8f446f2bbde28ce98e7ad4e33550d7fdb8ad069
Android Build Merger (Role) [Fri, 28 Jul 2017 19:34:48 +0000 (19:34 +0000)]
Merge "Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae am:
ae0dbe3e13" into oc-mr1-dev-plus-aosp
Fan Zhang [Fri, 28 Jul 2017 19:34:29 +0000 (19:34 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae
am:
ae0dbe3e13
Change-Id: Ica05aff63af3f64996a434862cf60b358d0f8bfc
Fan Zhang [Fri, 28 Jul 2017 19:34:13 +0000 (19:34 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev am:
9f93faf7ae
am:
81840033e3
Change-Id: I6898c45e13ee4418fb83d78e77303dbfa097888b
Fan Zhang [Fri, 28 Jul 2017 19:29:44 +0000 (19:29 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am:
9f93faf7ae
Change-Id: I5c0dc1366be5059fe7387831c3ee88cf9dfa0b43
Fan Zhang [Fri, 28 Jul 2017 19:29:44 +0000 (19:29 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
am:
9f93faf7ae
Change-Id: I596f52f4db123c3df485a1a194966771706650db
TreeHugger Robot [Fri, 28 Jul 2017 19:21:45 +0000 (19:21 +0000)]
Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev
Bill Yi [Fri, 28 Jul 2017 18:43:06 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE am:
8432802275 -s ours am:
3908af4a6d -s ours" into oc-mr1-dev-plus-aosp
am:
70b975d109 -s ours
Change-Id: Ie12db463b5f6fba9243902033d80b3e1b42d7f16
Bill Yi [Fri, 28 Jul 2017 18:42:39 +0000 (18:42 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours am:
be723e5868 -s ours
am:
91c157eb9a -s ours
Change-Id: Ibb67e97669b5e663558db29ad54289a223da760f
Maurice Lam [Mon, 24 Jul 2017 23:39:00 +0000 (16:39 -0700)]
Align screen lock options to view start
Test: Manual
Bug:
63715610
Change-Id: If723a200ee402dcd7204e20e2a02cb151935d1fd
Android Build Merger (Role) [Fri, 28 Jul 2017 18:39:08 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE am:
8432802275 -s ours am:
3908af4a6d -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Fri, 28 Jul 2017 18:38:37 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours
am:
be723e5868 -s ours
Change-Id: If5f3769fcbd92212d61d70b3dcecf9f80c58e991
Bill Yi [Fri, 28 Jul 2017 18:38:36 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE am:
8432802275 -s ours
am:
3908af4a6d -s ours
Change-Id: Icafe96c868f340b6fa48cc0052aca178071d1817
Bill Yi [Fri, 28 Jul 2017 18:34:04 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE
am:
8432802275 -s ours
Change-Id: I447c5c121a9aca19f9ca2da7ac29e2dae439864a
Bill Yi [Fri, 28 Jul 2017 18:34:04 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE
am:
8432802275 -s ours
Change-Id: I6dacb50f9fe4d6ba5a44e3a1249c58afe24747de
Ajay Nadathur [Fri, 28 Jul 2017 18:08:40 +0000 (18:08 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev am:
cfcd1c4b77
am:
8f0791a8e1
Change-Id: I5fb9a512746e45f67f8c783af897981af4c8830a
Ajay Nadathur [Fri, 28 Jul 2017 18:08:18 +0000 (18:08 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev am:
d2352cdd08
am:
4f27a4de98
Change-Id: Ic7caf0cfa42d0f835b238ea17289e68c8e1ac773
Ajay Nadathur [Fri, 28 Jul 2017 18:07:57 +0000 (18:07 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev am:
57a92e5a19
am:
60746517bf
Change-Id: Ib8d0417d7a8d96a97945db0e5299f5990386d9e6
Doris Ling [Fri, 28 Jul 2017 18:07:34 +0000 (18:07 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev am:
51fb9ad956
am:
7cdb94384f
Change-Id: Iae7f415054b1848a4c33d89e176f38fb942ded03
Ajay Nadathur [Fri, 28 Jul 2017 17:51:25 +0000 (17:51 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
am:
cfcd1c4b77
Change-Id: I9d99a7d65d38609e2db3c2e24f70bf537b9e8660
Ajay Nadathur [Fri, 28 Jul 2017 17:51:03 +0000 (17:51 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev
am:
d2352cdd08
Change-Id: Id8f23cc08b481405c82318972107e283035816a7
Ajay Nadathur [Fri, 28 Jul 2017 17:50:42 +0000 (17:50 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
am:
57a92e5a19
Change-Id: Ie06c454b68aa5cb82c3fcec9fbb39af72e38021b
Ajay Nadathur [Fri, 28 Jul 2017 17:45:22 +0000 (17:45 +0000)]
Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:45:00 +0000 (17:45 +0000)]
Merge "Update text for lock screen notifications" into oc-mr1-dev
Ajay Nadathur [Fri, 28 Jul 2017 17:44:44 +0000 (17:44 +0000)]
Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev
Doris Ling [Fri, 28 Jul 2017 17:25:51 +0000 (17:25 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
am:
51fb9ad956
Change-Id: I5df37cf381ef448bda838756b466f78d85fa8f8b
Fan Zhang [Fri, 28 Jul 2017 17:22:07 +0000 (10:22 -0700)]
Update search bar's navup content description
It should read "Search settings"
Change-Id: I1a55f905949341b290ea5f224171592cf5021e31
Fix:
64140213
Test: talkback
Doris Ling [Fri, 28 Jul 2017 17:03:49 +0000 (17:03 +0000)]
Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev
jackqdyulei [Wed, 19 Jul 2017 17:46:21 +0000 (10:46 -0700)]
Turn off some anomaly detectors by default
1. Wakeup alarm detector
Because we cannot distinguish it between foreground and background
2. Bluetooth unoptimized scanning detector
There is a bug in framework that may undercount the scanning time
Bug:
63390581
Bug:
63964363
Test: RunSettingsRoboTests
Change-Id: Ia762f580462823e8eddccbeb12dec3876b0ef47a
Bill Yi [Fri, 28 Jul 2017 16:12:22 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE am:
129ed98650 -s ours
am:
1e719a0ed7 -s ours
Change-Id: I78b9084ec7eaf3e32a7938215088b2d24d3d588a
Bill Yi [Fri, 28 Jul 2017 16:09:52 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE
am:
129ed98650 -s ours
Change-Id: I6778963c60c8e1a973c084d5ec1889d3e0d13848
Bill Yi [Fri, 28 Jul 2017 10:27:50 +0000 (03:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9cb3de5de1845431f075d5ca6c7935d49e0e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Fri, 28 Jul 2017 10:08:41 +0000 (03:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie25fb80dbf73c1681c72adf0cfac13c319f952b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Fri, 28 Jul 2017 09:52:17 +0000 (02:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee17c5b632e8caa7d538fbc5bc1e095806e82b78
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Fri, 28 Jul 2017 03:03:52 +0000 (03:03 +0000)]
Merge "Unify action buttons to a common widget (part 1)"
jackqdyulei [Fri, 28 Jul 2017 02:45:50 +0000 (02:45 +0000)]
Merge "Add ResultPayload for Allow notification dots am:
c50495ba06 am:
52aeaefbbe -s ours" into oc-mr1-dev-plus-aosp
am:
03b6f9a78c -s ours
Change-Id: I25dce62655c4d15076c1dec7af9ae51827a0edb3
jackqdyulei [Fri, 28 Jul 2017 02:45:20 +0000 (02:45 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06 -s ours am:
1b4b6e490a -s ours
am:
fe64e2c80b -s ours
Change-Id: Ic7a7672003ea5dd753481200fb00e19af1ab4a77
Android Build Merger (Role) [Fri, 28 Jul 2017 02:42:59 +0000 (02:42 +0000)]
Merge "Add ResultPayload for Allow notification dots am:
c50495ba06 am:
52aeaefbbe -s ours" into oc-mr1-dev-plus-aosp
jackqdyulei [Fri, 28 Jul 2017 02:42:44 +0000 (02:42 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06
am:
52aeaefbbe -s ours
Change-Id: If0e7654814e9d7cec6758e2b657ccb61bfe9f425
jackqdyulei [Fri, 28 Jul 2017 02:42:32 +0000 (02:42 +0000)]
Add ResultPayload for Allow notification dots am:
c50495ba06 -s ours
am:
1b4b6e490a -s ours
Change-Id: Id02fbd2ac2ad5b6918097ff8819ee62f7f5d4945
jackqdyulei [Fri, 28 Jul 2017 02:40:02 +0000 (02:40 +0000)]
Add ResultPayload for Allow notification dots
am:
c50495ba06
Change-Id: I98790c3e21e28a9b4a6c7bb976c2c512f427ef09
jackqdyulei [Fri, 28 Jul 2017 02:40:00 +0000 (02:40 +0000)]
Add ResultPayload for Allow notification dots
am:
c50495ba06 -s ours
Change-Id: I96dd4e021bf51c330b10a9bba8901d66165cd787
Fan Zhang [Thu, 27 Jul 2017 19:14:59 +0000 (12:14 -0700)]
Unify action buttons to a common widget (part 1)
- Create a preference type to host action button preferences.
- Convert app battery usage page to use the new preference
- Convert wifi detail page to use the new preference
Change-Id: I60bc473986ab46f2897e2537eb0e013fa813a4fc
Fix:
63991885
Test: robotests
Fan Zhang [Fri, 28 Jul 2017 00:50:41 +0000 (17:50 -0700)]
Query search result intent before launching to avoid crash
If intent cannot launch, log error.
Change-Id: Ib6f37da467749be1ef09e6665dcab122e71a52d3
Fix:
64065678
Test: robotests
Doris Ling [Fri, 28 Jul 2017 00:28:32 +0000 (00:28 +0000)]
Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours am:
e1b04c987b -s ours" into oc-mr1-dev-plus-aosp
am:
1007885701 -s ours
Change-Id: Iaf4466acd516b44f60bf1fd573ad108e30d0e676
Doris Ling [Fri, 28 Jul 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 am:
1b2ec4f096 -s ours
am:
c691528377 -s ours
Change-Id: Ic271833cd6d281d5cf51b8d0e8f385e55d7484e7
Android Build Merger (Role) [Fri, 28 Jul 2017 00:00:55 +0000 (00:00 +0000)]
Merge "Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours am:
e1b04c987b -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Thu, 27 Jul 2017 23:59:19 +0000 (23:59 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43
am:
1b2ec4f096 -s ours
Change-Id: I82d433fbb10e186fb99808f1fc22fa9c58b36dc6
Doris Ling [Thu, 27 Jul 2017 23:56:21 +0000 (23:56 +0000)]
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am:
70f0013e43 -s ours
am:
e1b04c987b -s ours
Change-Id: I3b44fd463983de7478132765493ea298fba2a974