Geoffrey Pitsch
f032bf2df2
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev am: 6688dae166
...
am: 5e36b66c91
-s ours
Change-Id: I2df1f21e9ef98683d49624ca8fe9890511872021
2017-01-10 19:18:13 +00:00
Geoffrey Pitsch
65b2ee4074
DO NOT MERGE Fix Notification Settings when unblockable app is blocked. am: db380fa9cb
...
am: 1eefc78280
-s ours
Change-Id: If9d0a59c98cd2502aa79537bd210ac7321b607aa
2017-01-10 19:17:56 +00:00
Geoffrey Pitsch
5e36b66c91
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
...
am: 6688dae166
Change-Id: Ib8004c18bcc9db33c2340f89fc93268e41026c4d
2017-01-10 19:12:26 +00:00
Geoffrey Pitsch
1eefc78280
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
...
am: db380fa9cb
Change-Id: I248be6a106a5dc20b5e391b2aebc267786a97e65
2017-01-10 19:12:25 +00:00
Geoffrey Pitsch
6688dae166
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
2017-01-10 19:06:01 +00:00
Fan Zhang
4185b2fef3
Merge "Create MeteredPreference with correct preference context."
2017-01-10 17:12:23 +00:00
Fan Zhang
a3af5a5c28
Merge "Set parent activity for search."
2017-01-10 17:11:41 +00:00
Bill Yi
701d1b7b50
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: adce1145a9
-s ours
...
am: 7a490316e0
-s ours
Change-Id: I85f851533bb020a3403f8bcc550b7df6261cca66
2017-01-10 07:37:40 +00:00
Bill Yi
40a2a676ec
Import translations. DO NOT MERGE am: 5d8d883ab1
-s ours
...
am: ff2cdd084a
-s ours
Change-Id: I2e50c1a292eb982524eaeb7b0aae61a63278116f
2017-01-10 07:37:23 +00:00
Bill Yi
7a490316e0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: adce1145a9
-s ours
Change-Id: I7d6248afd47be986586f45a98b23a932d8457c2b
2017-01-10 07:27:47 +00:00
Bill Yi
ff2cdd084a
Import translations. DO NOT MERGE
...
am: 5d8d883ab1
-s ours
Change-Id: I6227215a415906f4f6ba04e9d7edc0a587dafb3c
2017-01-10 07:27:45 +00:00
TreeHugger Robot
adce1145a9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-01-10 07:18:42 +00:00
TreeHugger Robot
9c18faaac5
Merge "Import translations. DO NOT MERGE"
2017-01-10 07:17:34 +00:00
TreeHugger Robot
3f5c3e3bc6
Merge "Remove debug log statement."
2017-01-10 02:25:19 +00:00
TreeHugger Robot
f349b07f96
Merge "Add metric event for skipping support disclaimer in future"
2017-01-10 02:03:08 +00:00
pkanwar
33abd37cbc
DO NOT MERGE: Fix NPE in ConfigureWifiSettings. am: ef2b35ad59
-s ours
...
am: 63262f8975
-s ours
Change-Id: Ie7b9c2c39835c81965998bea6255317b0de3740a
2017-01-10 01:04:36 +00:00
Daniel Nishi
7f6d117c28
Remove debug log statement.
...
It accidentally was left in from a previous patch.
Test: None
Change-Id: I5f1638be7154b0870c19a8624be18e6aa433b4d8
2017-01-09 17:04:25 -08:00
Fan Zhang
da2d426d49
Create MeteredPreference with correct preference context.
...
Bug: 33775510
Test: visual
Change-Id: I201e685f70379e48053ee910113d5ce75fddc16e
2017-01-09 16:58:41 -08:00
pkanwar
63262f8975
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
...
am: ef2b35ad59
-s ours
Change-Id: I512a3b568246c2693a335c63a22e88d6d4b3edbe
2017-01-10 00:58:24 +00:00
Fan Zhang
408c6a3e87
Set parent activity for search.
...
This enables the nav up button from actionbar.
Fix: 34176247
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java
Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2
2017-01-09 16:39:25 -08:00
Salvador Martinez
553ba00a27
Add metric event for skipping support disclaimer in future
...
We were not recording when users selected to skip the
support disclaimer in future requests for support. This
event has been added and logged when it occurs.
Test: SettingsRoboTests
Bug: 33414180
Change-Id: I689580ea2256d5554afcd17e77f90ae498d4ad1b
2017-01-09 15:59:41 -08:00
TreeHugger Robot
e5a7da2b16
Merge "Fix the animation issue in DashboardSummary"
2017-01-09 22:00:35 +00:00
Bill Yi
5d8d883ab1
Import translations. DO NOT MERGE
...
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
2017-01-09 13:14:43 -08:00
Bill Yi
e5c3cfb8ac
Import translations. DO NOT MERGE
...
Change-Id: Ibd775a35c77810883e6366efbf9f0e4a0723b18a
Auto-generated-cl: translation import
2017-01-09 13:08:57 -08:00
jackqdyulei
0bb598c4d0
Fix the animation issue in DashboardSummary
...
1. When condition is inserted, only scroll to top when previous
position is at the top.
2. Clean condition status after it is removed. So the next time
you insert a condition view, it will always be collapsed.
Bug: 33839780
Bug: 34115341
Test: make -j40 RunSettingsRoboTests
Change-Id: I7f48524917c3119ec24b2f67ba506f381573a391
2017-01-09 12:30:57 -08:00
pkanwar
ef2b35ad59
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
...
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.
Bug: 34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
2017-01-09 12:21:22 -08:00
Fan Zhang
ffd328b071
Misc fixes for IA and pattern.
...
Disable NFC fragments when feature is not avaiable
Link to spell checker screen with the pref is clicked
Tint "add"/"delete" button in UserDictionary actionbar to proper color.
Change-Id: I8a8e219ce3dbbafc6c4d5a0f34f835ffd0abad4f
Fix: 34155679
Fix: 34161006
Fix: 34154795
Test: RunSettingsRoboTests
2017-01-09 10:58:44 -08:00
Fan Zhang
c4372f1a48
Merge "Only show first 5 items in sound setting until click More."
2017-01-09 17:57:05 +00:00
Julia Reynolds
d5e2bfcc7a
Merge "Cannot have badge only channels."
2017-01-09 14:59:52 +00:00
Fan Zhang
ae182dedee
Merge "Fully enable IA."
2017-01-07 23:32:50 +00:00
Fan Zhang
f91f7f7063
Fully enable IA.
...
This saves about 120ms for app start time.
Bug: 34103984
Test: RunSettingsRoboTests
Change-Id: Ib1d2b190eb3b563b99c7f9d82e11e28229fe3316
2017-01-07 13:13:10 -08:00
TreeHugger Robot
3d8a97fc14
Merge "Progressive disclosure on selected UIs: app, display"
2017-01-07 20:39:33 +00:00
Fan Zhang
b1ddde17d2
Only show first 5 items in sound setting until click More.
...
Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: Ib9449b70e2f2a003b3c6a810d0cc03016d025edb
2017-01-07 11:21:11 -08:00
Fan Zhang
d916dae218
Progressive disclosure on selected UIs: app, display
...
Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I1651433ba30a2b5f880095e07b5e2ed9c4e308b9
2017-01-07 11:21:06 -08:00
Pavlin Radoslavov
a234cc169b
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f
am: 0115cc702a
am: cc7a8d0b2c
...
am: 763830a0e6
Change-Id: I0f4c10cd00d33f4d2ed42753da2a2edcd66e2d72
2017-01-07 01:41:04 +00:00
Pavlin Radoslavov
763830a0e6
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f
am: 0115cc702a
...
am: cc7a8d0b2c
Change-Id: Ieafda5fcbaa1252f34e06345f6f2bc0a509e4d68
2017-01-07 01:36:55 +00:00
Pavlin Radoslavov
cc7a8d0b2c
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f
...
am: 0115cc702a
Change-Id: I8d2e73d3c91ac18005f8e6f74e39c81e84ad41c3
2017-01-07 01:28:45 +00:00
Pavlin Radoslavov
0115cc702a
Merge "Add Bluetooth Codec selection UI to the Developer Options"
...
am: bb08073b6f
Change-Id: I1586182f52b726a56c92d2ed35e1e6dd6eff237e
2017-01-07 01:24:43 +00:00
Treehugger Robot
bb08073b6f
Merge "Add Bluetooth Codec selection UI to the Developer Options"
2017-01-07 01:19:33 +00:00
Pavlin Radoslavov
c65956efc8
Add Bluetooth Codec selection UI to the Developer Options
...
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I75027200561e6c51fa767c427ed09b647757d0ab
2017-01-06 15:44:55 -08:00
TreeHugger Robot
a6c3e3ace5
Merge "Add header and remove button to account detail page."
2017-01-06 23:02:12 +00:00
Doris Ling
fd06d2fcf4
Add header and remove button to account detail page.
...
- Add account header which contains the account icon and name to the top
of the account detail page.
- Also add the remove account button to the bottom of the page.
Change-Id: I24f1a17a7f9c4dd8c840a2b0329c0965e4e612e9
Fix: 33543525
Test: make RunSettingsRoboTests
2017-01-06 13:20:08 -08:00
Julia Reynolds
d43440a555
Cannot have badge only channels.
...
Test: manual
Change-Id: I564f6b7e076a10847bd7f48c59a0de095180ea92
2017-01-06 15:53:52 -05:00
Fan Zhang
224caada2d
Only update categories after all setTileEnabled() are done.
...
Bug: 34103984
Test: RunSettingsRoboTests (dashboard refresh related tests no regression)
Change-Id: I8b487c1a3074c6e4756215da1fcfee12daafbfe2
2017-01-06 11:47:05 -08:00
TreeHugger Robot
63e8d160f9
Merge "Wrap old search index update logic behind FeatureProvider."
2017-01-06 19:13:06 +00:00
Fan Zhang
a875924100
Wrap old search index update logic behind FeatureProvider.
...
Change-Id: I31024d2e7900a90b4f7dc8cc81951bf6a0e533fa
Fix: 34123028
Test: RunSettingsRoboTests
2017-01-06 09:18:59 -08:00
TreeHugger Robot
3d07ce6d46
Merge "Fix test from security feature provider."
2017-01-06 03:13:50 +00:00
TreeHugger Robot
f940f86bbc
Merge "Do not load old category when IA is enabled."
2017-01-06 03:01:17 +00:00
TreeHugger Robot
f7dd2c7547
Merge "Add icon for new IA."
2017-01-06 02:26:26 +00:00
TreeHugger Robot
9b5aa62147
Merge "Update tile color from using accent to colorControlNormal."
2017-01-06 02:18:14 +00:00