OSDN Git Service
Fan Zhang [Fri, 12 May 2017 18:06:48 +0000 (18:06 +0000)]
Merge "Revert "Filter and display top 3 suggestions for exclusive type""
Fan Zhang [Fri, 12 May 2017 18:03:58 +0000 (18:03 +0000)]
Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit
70b634adcff5a7d0f453ddaedfd2c772b29d8757.
Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
TreeHugger Robot [Fri, 12 May 2017 17:28:30 +0000 (17:28 +0000)]
Merge "Filter and display top 3 suggestions for exclusive type"
Adrian Roos [Fri, 12 May 2017 16:40:08 +0000 (16:40 +0000)]
Merge "AOD: Add temporary always-on setting"
Fan Zhang [Thu, 11 May 2017 22:39:38 +0000 (15:39 -0700)]
Filter and display top 3 suggestions for exclusive type
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix:
37947647
Test: make RunSettingsRoboTests
Julia Reynolds [Fri, 12 May 2017 12:28:35 +0000 (12:28 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev am:
6393e1752f
am:
237eb88434
Change-Id: Ie8c6262c35b79259974ffe069b37b2e6d2507b50
Julia Reynolds [Fri, 12 May 2017 12:20:36 +0000 (12:20 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
am:
6393e1752f
Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
Julia Reynolds [Fri, 12 May 2017 12:14:07 +0000 (12:14 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
Amin Shaikh [Fri, 12 May 2017 09:00:33 +0000 (09:00 +0000)]
Merge changes from topic 'onarevert' into oc-dev am:
b747be0769
am:
8485562ded
Change-Id: Ifb18d7f498cca6e51922460b516650982dbedabd
Amin Shaikh [Fri, 12 May 2017 09:00:24 +0000 (09:00 +0000)]
Revert "Update "Open networks available" toggle to instead open notification channel preferences." am:
dfa9bb8914
am:
c3666f1c35
Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
Matthew Fritze [Fri, 12 May 2017 08:59:41 +0000 (08:59 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am:
b38c1e5353
am:
01f5f5d5c9
Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
Chris Wren [Fri, 12 May 2017 08:59:11 +0000 (08:59 +0000)]
Merge "add a global control for badging" into oc-dev am:
1425b91bac
am:
aebf049b4f
Change-Id: I68417e74c7a46cf6283529f17a5f3f9d5547354a
jackqdyulei [Fri, 12 May 2017 08:58:41 +0000 (08:58 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev am:
6c680a36c5
am:
4b749c2b0a -s ours
Change-Id: Ic9916764c661041609a80ffe4edc35406ff10cad
Doris Ling [Fri, 12 May 2017 08:58:02 +0000 (08:58 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev am:
d3e33ebcef
am:
93ff2d69f1
Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2
Chris Wren [Fri, 12 May 2017 08:57:05 +0000 (08:57 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev am:
72cc7b7915
am:
715f096678
Change-Id: I164b72d8bcff91e563b70ad6d7051b4617bc46b2
Amin Shaikh [Fri, 12 May 2017 06:48:13 +0000 (06:48 +0000)]
Merge changes from topic 'onarevert' into oc-dev
am:
b747be0769
Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c
Amin Shaikh [Fri, 12 May 2017 06:48:04 +0000 (06:48 +0000)]
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am:
dfa9bb8914
Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
Matthew Fritze [Fri, 12 May 2017 06:46:32 +0000 (06:46 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am:
b38c1e5353
Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
Chris Wren [Fri, 12 May 2017 05:57:49 +0000 (05:57 +0000)]
Merge "add a global control for badging" into oc-dev
am:
1425b91bac
Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
jackqdyulei [Fri, 12 May 2017 04:58:12 +0000 (04:58 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev
am:
6c680a36c5
Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
Doris Ling [Fri, 12 May 2017 04:57:40 +0000 (04:57 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
am:
d3e33ebcef
Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
Chris Wren [Fri, 12 May 2017 04:57:08 +0000 (04:57 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev
am:
72cc7b7915
Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
TreeHugger Robot [Fri, 12 May 2017 04:40:21 +0000 (04:40 +0000)]
Merge changes from topic 'onarevert' into oc-dev
* changes:
Update "Open networks available" setting.
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
TreeHugger Robot [Fri, 12 May 2017 02:04:37 +0000 (02:04 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
Chris Wren [Fri, 12 May 2017 01:49:01 +0000 (01:49 +0000)]
Merge "add a global control for badging" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 01:35:22 +0000 (01:35 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 01:31:20 +0000 (01:31 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
Adrian Roos [Wed, 10 May 2017 20:26:25 +0000 (13:26 -0700)]
AOD: Add temporary always-on setting
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.
Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.
Also adds tests for both doze preference controllers.
Bug:
33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
TreeHugger Robot [Thu, 11 May 2017 23:45:26 +0000 (23:45 +0000)]
Merge "Add bluetooth visible item"
TreeHugger Robot [Thu, 11 May 2017 23:06:57 +0000 (23:06 +0000)]
Merge "Add animation for battery asyncLoader."
TreeHugger Robot [Thu, 11 May 2017 22:41:11 +0000 (22:41 +0000)]
Merge "Refactor choose lock password scrolling"
jackqdyulei [Fri, 21 Apr 2017 20:12:06 +0000 (13:12 -0700)]
Add animation for battery asyncLoader.
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug:
35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Bill Yi [Thu, 11 May 2017 21:47:39 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Chris Wren [Thu, 11 May 2017 21:31:45 +0000 (21:31 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev
Chris Wren [Fri, 5 May 2017 22:10:17 +0000 (18:10 -0400)]
add a global control for badging
Bug:
36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
Maurice Lam [Fri, 28 Apr 2017 02:04:46 +0000 (19:04 -0700)]
Refactor choose lock password scrolling
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.
Bug:
38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
Maurice Lam [Thu, 11 May 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev am:
59f965d698
am:
7e60ce0109
Change-Id: I7551cd4c9d045f274ceac271da71667aeb275966
Julia Reynolds [Tue, 9 May 2017 14:15:51 +0000 (10:15 -0400)]
Notification settings, importance and pre-O apps
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes:
38177887
Bug:
38120923
Fixes:
38012300
Fixes:
37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
Maurice Lam [Thu, 11 May 2017 18:20:19 +0000 (18:20 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev
am:
59f965d698
Change-Id: Ia9a520419b67304342b528220a592c7629e4c1bc
jackqdyulei [Tue, 25 Apr 2017 20:32:02 +0000 (13:32 -0700)]
Add bluetooth visible item
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.
This cl creates a preference controller to handle the logic for
device name preference.
Bug:
35876447
Test: RunSettingsRoboTests
Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
Bill Yi [Thu, 11 May 2017 18:10:10 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
Chris Wren [Thu, 11 May 2017 15:11:17 +0000 (11:11 -0400)]
allow secondary users to use notification settings
Bug:
38197667
Test: manual
Change-Id: Ib3b5f865eccc4e47ea00b190e402c3668559f427
Maurice Lam [Thu, 11 May 2017 17:35:16 +0000 (17:35 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev
jackqdyulei [Fri, 21 Apr 2017 20:12:06 +0000 (13:12 -0700)]
Add animation for battery asyncLoader.
Fix merge conflict from oc-dev
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug:
35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Matthew Fritze [Thu, 11 May 2017 15:54:31 +0000 (08:54 -0700)]
Remove dynamic summaries for "On the lockscreen"
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
Bill Yi [Thu, 11 May 2017 11:50:09 +0000 (11:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f1730bee90 -s ours
am:
ee8789939e -s ours
Change-Id: I4078ac746b6c2382d26ef9a1aa750c09bd414ede
Stephen Chen [Thu, 11 May 2017 06:18:36 +0000 (06:18 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am:
25d1848e5f
am:
ac1b935437
Change-Id: Ieec705671f062119f67a94b559edc40762d90950
Bill Yi [Thu, 11 May 2017 01:21:10 +0000 (01:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f1730bee90 -s ours
Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65
Doris Ling [Thu, 11 May 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev am:
cf162d5354
am:
2a23542e68
Change-Id: Ifa0d367e40647ce825e90985658dc6a042edc2bd
Roozbeh Pournader [Thu, 11 May 2017 01:04:05 +0000 (01:04 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev am:
319250b1eb
am:
3a32750ee6
Change-Id: Ic6c6e8eb3e1bf0d5597e0d9e83b327265c847b3b
Jesse Evans [Thu, 11 May 2017 01:03:32 +0000 (01:03 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev am:
3c19120945
am:
28839c0531
Change-Id: I9a07ac3ab22585c93f0f8d90f324dab99e24ca7f
Matthew Fritze [Thu, 11 May 2017 00:54:01 +0000 (00:54 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev am:
ec00573139
am:
ab13b378c9
Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616
Alison Cichowlas [Thu, 11 May 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev am:
b9a2d6a6e3
am:
16bc088c4e
Change-Id: Ia2204643ca06316a48810660fbbce5758020e45b
Daniel Nishi [Thu, 11 May 2017 00:52:43 +0000 (00:52 +0000)]
Merge "Fix the top summary layout." into oc-dev am:
154824f124
am:
4bff3e9841
Change-Id: I5b63fe9eca62a4c3a06206ebc1dfcd63e5b080bc
Daniel Nishi [Thu, 11 May 2017 00:52:07 +0000 (00:52 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev am:
9a5bac7d5a
am:
a3349519d5
Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
TreeHugger Robot [Thu, 11 May 2017 00:30:30 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Stephen Chen [Thu, 11 May 2017 00:22:12 +0000 (00:22 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
am:
25d1848e5f
Change-Id: Ic83a42d3fa508b2de14ee377eed6de92970fd31c
Doris Ling [Thu, 11 May 2017 00:21:31 +0000 (00:21 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
am:
cf162d5354
Change-Id: I73133604ea118457e49def80edbdcddb553e9bcd
Roozbeh Pournader [Thu, 11 May 2017 00:21:06 +0000 (00:21 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
am:
319250b1eb
Change-Id: I868f67c90626a39c3c0dd2f4107ab9bd755bb40c
Jesse Evans [Thu, 11 May 2017 00:20:40 +0000 (00:20 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
am:
3c19120945
Change-Id: I1cfc5a19c5a133607e5ebc0731632aca25a8f044
Matthew Fritze [Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
am:
ec00573139
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
Alison Cichowlas [Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
am:
b9a2d6a6e3
Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
Daniel Nishi [Thu, 11 May 2017 00:19:20 +0000 (00:19 +0000)]
Merge "Fix the top summary layout." into oc-dev
am:
154824f124
Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
Daniel Nishi [Thu, 11 May 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
am:
9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
Maurice Lam [Tue, 9 May 2017 04:43:02 +0000 (21:43 -0700)]
Check for sidecar null-ness before removing
Test: cd tests/robotests && mma
Bug:
36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 23:39:52 +0000 (23:39 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
Bill Yi [Wed, 10 May 2017 20:48:13 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 May 2017 20:47:28 +0000 (20:47 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
Lei Yu [Wed, 10 May 2017 20:42:01 +0000 (20:42 +0000)]
Merge "Expose mac address in bluetooth main page"
TreeHugger Robot [Wed, 10 May 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 19:54:53 +0000 (12:54 -0700)]
Set textDirection of app name to locale direction
Test: Manual
Fixes:
37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
Lei Yu [Wed, 10 May 2017 19:55:13 +0000 (19:55 +0000)]
Merge "Add feature provider for Bluetooth"
Doris Ling [Tue, 2 May 2017 18:28:14 +0000 (11:28 -0700)]
Also update the account preferences in displayPreference().
- start creating the account preferences in displayPreference() to make
the data available earlier.
- when trying to update the UI when the page is resumed, instead of
clearing the whole list and add the latest accounts, compare the
differences between the currently shown accounts and the latest accounts
and only update the account preferences that has been changed.
Change-Id: I249eb2fe67f4adaab02bf77680c62d07756dc94a
Fix:
34035653
Test: make RunSettingsRoboTests
Doris Ling [Wed, 10 May 2017 18:45:57 +0000 (11:45 -0700)]
Fix crash when activity not attached after search index finishes.
When search indexing completes, check for valid activity before
proceeding with further operations.
Change-Id: I7c72aa358574f79e2184d60bc9d0241595ea5d3b
Fix:
38198223
Test: make RunSettingsRoboTests
Salvador Martinez [Wed, 10 May 2017 18:50:53 +0000 (18:50 +0000)]
Merge "Fix null pointer error && add settings side guard"
Alison Cichowlas [Wed, 10 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
Alison Cichowlas [Tue, 9 May 2017 18:01:42 +0000 (14:01 -0400)]
Notifications settings updates to match spec:
- change badge language & remove summary
- change caps on sound text
Bug:
37479730,
37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
jackqdyulei [Wed, 29 Mar 2017 23:06:32 +0000 (16:06 -0700)]
Expose mac address in bluetooth main page
This mac address means the owned device, not the device
to connect.
Bug:
35875420
Test: RunSettingsRoboTests
Change-Id: I142f49fdca72d8ffbb9b8b2e2666a61aefb80505
Matthew Fritze [Wed, 3 May 2017 01:43:31 +0000 (18:43 -0700)]
Only add icons to settings items with icons
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug:
37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
Stephen Chen [Tue, 9 May 2017 19:50:42 +0000 (12:50 -0700)]
Update Wi-Fi Wakeup setting to check whether the feature is available.
Bug:
38037361
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I1c1b930546cc090d72f3047058a428acd1b2883a
Daniel Nishi [Wed, 10 May 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix the top summary layout." into oc-dev
Daniel Nishi [Wed, 10 May 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
Alex Salo [Wed, 10 May 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Location setting now updates summary timely."
Lei Yu [Wed, 10 May 2017 17:39:55 +0000 (17:39 +0000)]
Merge "Add framework for anomaly detection flags"
Matthew Fritze [Wed, 10 May 2017 05:40:55 +0000 (05:40 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev am:
8fc602fed8
am:
bdba7ab697 -s ours
Change-Id: I4e2fe671fefdd52df95bec2d35d6f26e33c7388a
Matthew Fritze [Wed, 10 May 2017 05:24:56 +0000 (05:24 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
am:
8fc602fed8
Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
TreeHugger Robot [Wed, 10 May 2017 05:07:52 +0000 (05:07 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
Fan Zhang [Wed, 10 May 2017 03:18:53 +0000 (03:18 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev am:
8ff8b5e95b
am:
1b628ea972
Change-Id: I9ee3528030f56d2a7acab0d599c71c595ab87031
Doris Ling [Wed, 10 May 2017 03:18:21 +0000 (03:18 +0000)]
Merge "Fix crash when silencing condition." into oc-dev am:
ba2f3ee3ba
am:
ce5e0c3dc6
Change-Id: I9e5c4f0f9f8ee4cdced52bf1f9d79b28912bb154
Fan Zhang [Wed, 10 May 2017 03:02:21 +0000 (03:02 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
am:
8ff8b5e95b
Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
TreeHugger Robot [Wed, 10 May 2017 02:57:18 +0000 (02:57 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 01:53:29 +0000 (01:53 +0000)]
Merge "Add support to show first impression type suggestions"
Doris Ling [Wed, 10 May 2017 01:45:17 +0000 (01:45 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
am:
ba2f3ee3ba
Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
TreeHugger Robot [Wed, 10 May 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
Fan Zhang [Wed, 10 May 2017 00:44:49 +0000 (17:44 -0700)]
Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix:
38011653
Test: visual
Alex Salo [Fri, 5 May 2017 22:36:27 +0000 (15:36 -0700)]
Location setting now updates summary timely.
Subscribed the LocationPreferenceController to listen to the location
providers changed action. This allows timely summary update. Previous
approach, directly calling the updateSummary method onResume failed in
the scenario when user changed the location settings via the
QuickSettings.
Test: Added robolectric tests, and manually verified the intended
behavior on a device.
Bug:
37956060
Change-Id: I2f81713d59da3384f3c98b327d377d529d440a88
Matthew Fritze [Tue, 9 May 2017 23:23:23 +0000 (23:23 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev am:
120ec5d1eb
am:
ec6cfe32fd -s ours
Change-Id: I788be238c6319201b2be91633d67e02076d169f9
Bill Yi [Tue, 9 May 2017 23:22:24 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4a0abee70e -s ours
am:
6d75c92f32 -s ours
Change-Id: I5b6d3319a7109cf9b207daf5345e97fbeb039273
OSDN Git Service
