OSDN Git Service
jackqdyulei [Wed, 3 May 2017 02:24:48 +0000 (02:24 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
am:
4b50e58a1d
Change-Id: I2997ffe57474de973a66932b685fbbaf9bf77955
TreeHugger Robot [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
jackqdyulei [Tue, 2 May 2017 22:16:19 +0000 (15:16 -0700)]
Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.
Bug:
37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
Matthew Fritze [Tue, 2 May 2017 19:29:18 +0000 (19:29 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
am:
d51b94b042
Change-Id: I2b915166c5a52082bfb0c4dff52ea9101f5c2514
TreeHugger Robot [Tue, 2 May 2017 19:25:52 +0000 (19:25 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
Miao Miao (苗苗) [Tue, 2 May 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b am:
c6e3467cc2
am:
b1480c8cab
Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
Miao Miao (苗苗) [Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)]
Merge "Settings crash when receiving data state broadcast" am:
2ed42d009b
am:
c6e3467cc2
Change-Id: If6ad081e117a94df84d041776649af63c392cc30
Miao Miao (苗苗) [Tue, 2 May 2017 17:44:08 +0000 (17:44 +0000)]
Merge "Settings crash when receiving data state broadcast"
am:
2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
Matthew Fritze [Mon, 24 Apr 2017 23:32:52 +0000 (16:32 -0700)]
Prevent empty non-Indexable keys from being added
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes:
37646265
Test: make RunSettingsRoboTests
Treehugger Robot [Tue, 2 May 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Settings crash when receiving data state broadcast"
Kevin Chyn [Tue, 2 May 2017 17:16:09 +0000 (17:16 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
am:
f1f35ee107
Change-Id: I105ef25110a9c7b158c08f61f5e0b4354490218e
TreeHugger Robot [Tue, 2 May 2017 17:12:20 +0000 (17:12 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:07:02 +0000 (17:07 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
am:
a41a190ac3
Change-Id: I967f4fd28c5375f0c56ad88dedc47a484918b629
Daniel Nishi [Tue, 2 May 2017 17:06:36 +0000 (17:06 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
am:
b4937f4556
Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
Daniel Nishi [Tue, 2 May 2017 17:03:36 +0000 (17:03 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:12 +0000 (17:03 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
The Android Open Source Project [Tue, 2 May 2017 15:59:49 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
23550fdcd3 -s ours
Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8
TreeHugger Robot [Tue, 2 May 2017 15:46:54 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 09:06:19 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
Kevin Chyn [Tue, 2 May 2017 04:23:31 +0000 (04:23 +0000)]
Revert "Swipe for notification should be default-on in settings app"
This reverts commit
a95c2c3a8d65d191260d4948a54eee1c74dac3fa.
Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
Kevin Chyn [Tue, 2 May 2017 04:14:47 +0000 (04:14 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
am:
9ab1318ca8
Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
TreeHugger Robot [Tue, 2 May 2017 04:09:30 +0000 (04:09 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev
Fan Zhang [Tue, 2 May 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
am:
74327fa4f0
Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd
TreeHugger Robot [Tue, 2 May 2017 02:23:34 +0000 (02:23 +0000)]
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
Amit Mahajan [Tue, 2 May 2017 02:07:38 +0000 (02:07 +0000)]
Merge "Change to not call update() if APN is not modified." into oc-dev
am:
7cab6a9a17
Change-Id: I7ae69ec7797f10e0d48a4ce7d1b3a80c18851911
TreeHugger Robot [Tue, 2 May 2017 01:59:37 +0000 (01:59 +0000)]
Merge "Change to not call update() if APN is not modified." into oc-dev
Jaekyun Seok [Tue, 2 May 2017 01:15:01 +0000 (01:15 +0000)]
Merge "Do not show static overlays as a theme" into oc-dev
am:
170acdb79b
Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa
TreeHugger Robot [Tue, 2 May 2017 01:03:53 +0000 (01:03 +0000)]
Merge "Do not show static overlays as a theme" into oc-dev
Jesse Evans [Tue, 2 May 2017 00:34:02 +0000 (00:34 +0000)]
Merge "Hides app buttons for instant apps" into oc-dev
am:
965508fc3e
Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
TreeHugger Robot [Tue, 2 May 2017 00:28:59 +0000 (00:28 +0000)]
Merge "Hides app buttons for instant apps" into oc-dev
Jaekyun Seok [Mon, 1 May 2017 23:21:06 +0000 (23:21 +0000)]
Merge "Generate license html file from xml files of partitions" am:
04a7e0a73a am:
f8aaf9ecdc
am:
8b5389f707
Change-Id: Id42eb0a0ea330c5758e4a77a31158b7dd26256b5
Jaekyun Seok [Mon, 1 May 2017 23:17:29 +0000 (23:17 +0000)]
Merge "Generate license html file from xml files of partitions" am:
04a7e0a73a
am:
f8aaf9ecdc
Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
Jaekyun Seok [Mon, 1 May 2017 23:15:34 +0000 (23:15 +0000)]
Merge "Generate license html file from xml files of partitions"
am:
04a7e0a73a
Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
Treehugger Robot [Mon, 1 May 2017 23:08:17 +0000 (23:08 +0000)]
Merge "Generate license html file from xml files of partitions"
Daniel Nishi [Fri, 28 Apr 2017 21:27:52 +0000 (14:27 -0700)]
Filter on volume for category storage view.
The other storage view used a compound filter with a UUID filter and the
normal filter. The category filters were omitting the compound UUID
filter. This adds it.
Test: Settings unit test
Change-Id: Ic0118abf58dabbf430a81e1fbcefb7acfdef472c
Fixes:
37780836
Jaekyun Seok [Tue, 18 Apr 2017 06:22:01 +0000 (15:22 +0900)]
Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
37099941
Merged-In: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
(cherry picked from commit
74812873f41adbd34ab3ff4fbd7dcbb8f6fde233)
Daniel Nishi [Mon, 1 May 2017 21:46:50 +0000 (21:46 +0000)]
Merge "Make the storage free/total sizes consistent." into oc-dev
am:
b22c11ae28
Change-Id: Ibee39375f0c714f5ff7578c24f78a387cd54bc44
Daniel Nishi [Mon, 1 May 2017 21:40:17 +0000 (21:40 +0000)]
Merge "Make the storage free/total sizes consistent." into oc-dev
Jaekyun Seok [Mon, 1 May 2017 21:27:01 +0000 (21:27 +0000)]
Merge "Generate license html file from xml files of partitions" into oc-dev
am:
7f59081421
Change-Id: Ia027639c81093af0defff40f2e85ddb499093652
TreeHugger Robot [Mon, 1 May 2017 21:22:18 +0000 (21:22 +0000)]
Merge "Generate license html file from xml files of partitions" into oc-dev
Jaekyun Seok [Sat, 29 Apr 2017 00:36:46 +0000 (09:36 +0900)]
Do not show static overlays as a theme
Static overlays aren't changeable by a user. So we shouldn't list them
as a theme.
This CL fixed b/
36812704 as well to run unit tests.
Test: building succeeded and tested on sailfish.
make RunSettingsRoboTests
adb shell am instrument -w -e class \
com.android.settings.display.ThemePreferenceControllerTest \
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Bug:
37480890
Bug:
36812704
Change-Id: I8c13b6956083095dceaab3da6642bef1647d6a30
Kevin Chyn [Mon, 1 May 2017 20:28:35 +0000 (13:28 -0700)]
Swipe for notification should be default-on in settings app
Fixes:
37672954
Test: adb shell settings delete secure system_navigation_keys_enabled
delete/toggle the setting above between null/0/1
Change-Id: Ia8f5665136ebae1fcc8f77d839a507ab9be7c1da
Fan Zhang [Fri, 28 Apr 2017 19:23:30 +0000 (12:23 -0700)]
Tweak spacing for horizontal preferences.
- Add minHeight to horizontal preference so they are not clustered
together.
- Wrap app_data_usage's into different categories so they don't rely on
SpacePreference to draw space and dividers.
Change-Id: Ieed90a39d48494d1207680483968b5733bdfb344
Fix:
37750568
Test: visual
(cherry picked from commit
9c93c28b5a9e3d1ff78b7ee4febcb39a5f447aeb)
Jesse Evans [Mon, 1 May 2017 18:12:52 +0000 (11:12 -0700)]
Hides app buttons for instant apps
Hides the app buttons when the app is an instant app.
Added a todo to remove this functionality when instant apps
are properly supported by this controller.
Test: make RunSettingsRoboTests
Bug:
37313605
Change-Id: I3fca106a8e72c41b626e1182f5ba1089b90e8e2a
Jeff Sharkey [Mon, 1 May 2017 18:10:45 +0000 (18:10 +0000)]
Merge "Change String to CharSequence in #loadSummary." into oc-dev
am:
ad597344a2
Change-Id: Id636a6558f38673749255d01a30190fa762b7619
Jeff Sharkey [Mon, 1 May 2017 17:52:22 +0000 (17:52 +0000)]
Merge "Change String to CharSequence in #loadSummary." into oc-dev
Jesse Evans [Mon, 1 May 2017 17:02:27 +0000 (17:02 +0000)]
Make instant apps appear above disabled apps
am:
b2d85af91e
Change-Id: Ie2fe92d08bf8d8697a5bf99add1efc83b8873956
Jesse Evans [Wed, 26 Apr 2017 15:31:16 +0000 (08:31 -0700)]
Make instant apps appear above disabled apps
Currently instant apps appear below disabled apps in the app filter
spinner, this is incorrect. This patch moves them above the disabled
apps filter option.
Test: make RunSettingsRoboTests
Bug:
37683262
Change-Id: Id65ae47baca4eac43a6a89375bdb718d5dbf7c56
Amit Mahajan [Thu, 27 Apr 2017 21:50:39 +0000 (14:50 -0700)]
Change to not call update() if APN is not modified.
Test: manual
Bug:
37629096
Change-Id: Icd7e61267d724b576edf872485dd1a1e2ab18d46
Fan Zhang [Sat, 29 Apr 2017 19:47:19 +0000 (12:47 -0700)]
Update vpn icon from setting gear to vpn key.
Change-Id: Ic135d5e28a0547e949c8170f985e4de26e05ad51
Fix:
37781101
Test: visual
Bill Yi [Sat, 29 Apr 2017 18:05:56 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
0ee4e7df8e -s ours
Change-Id: I47fd4022a9ba5a639e35c011f83a32559bfaefaa
TreeHugger Robot [Sat, 29 Apr 2017 17:59:42 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Fan Zhang [Sat, 29 Apr 2017 06:58:11 +0000 (06:58 +0000)]
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
am:
b50460086d
Change-Id: I3d1a1958999aed60b44da454f341ed711a64a589
Fan Zhang [Sat, 29 Apr 2017 06:57:43 +0000 (06:57 +0000)]
Merge "Add emergency broadcast to app & notification settings." into oc-dev
am:
908cad27ab
Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35
TreeHugger Robot [Sat, 29 Apr 2017 06:53:26 +0000 (06:53 +0000)]
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
TreeHugger Robot [Sat, 29 Apr 2017 06:53:11 +0000 (06:53 +0000)]
Merge "Add emergency broadcast to app & notification settings." into oc-dev
Philip P. Moltmann [Sat, 29 Apr 2017 05:24:18 +0000 (05:24 +0000)]
Merge "Add "add service" pref to the autofill picker" into oc-dev
am:
9301381ac2
Change-Id: Ifde40f13acc2881209231267f5252f5b56c627f1
Philip P. Moltmann [Sat, 29 Apr 2017 05:14:36 +0000 (05:14 +0000)]
Merge "Add "add service" pref to the autofill picker" into oc-dev
Saige McVea [Sat, 29 Apr 2017 03:29:40 +0000 (20:29 -0700)]
Change String to CharSequence in #loadSummary.
Per API council review, localized strings should return CharSequence. Changes here
account for the different type returned.
Test: ag/
1813674
Bug:
37723508
Change-Id: I7dacab8af48932db031de22835b65eba30393956
Bill Yi [Sat, 29 Apr 2017 02:46:17 +0000 (19:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ae57f3a1b494044e26518590797977fa331a975
Auto-generated-cl: translation import
Jaekyun Seok [Tue, 18 Apr 2017 06:22:01 +0000 (15:22 +0900)]
Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
37099941
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Fan Zhang [Fri, 28 Apr 2017 23:24:40 +0000 (23:24 +0000)]
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
am:
30e9474dbb
Change-Id: Ib72ca3ea03b3fb32d018e1fbad9b697ce5dd1391
TreeHugger Robot [Fri, 28 Apr 2017 23:08:19 +0000 (23:08 +0000)]
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
Fan Zhang [Fri, 28 Apr 2017 20:51:08 +0000 (13:51 -0700)]
Add emergency broadcast to app & notification settings.
Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.
Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix:
36557600
Test: robotests
Fan Zhang [Fri, 28 Apr 2017 21:06:28 +0000 (21:06 +0000)]
Revert "Display and parse numbers properly in all locales"
Bug:
37311645
This reverts commit
8648c5ed3d7c97915bd2ba0eeb413c98adf31eea.
Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
Philip P. Moltmann [Thu, 27 Apr 2017 22:38:27 +0000 (15:38 -0700)]
Add "add service" pref to the autofill picker
Mimicing the behavior we have for adding a print service.
Fixes:
37735998
Test: - Started auto fill picker with add-service-settings set and unset.
Only if set, the preference is added
- RunSettingsRoboTests (unrelated failure in
SetupChooseLockPatternTest)
- Enable + disable auto fill service while settings is open
Change-Id: Ie019a032a1d01373f8fd0ebd7ae2ddf9c4d8871f
Doris Ling [Fri, 28 Apr 2017 19:34:34 +0000 (19:34 +0000)]
Merge "Add content description to the master switch toggle button." into oc-dev
am:
10158feecf
Change-Id: Icc68b53cbbb93755c7ce90db1c4d2f70d5e44cd1
TreeHugger Robot [Fri, 28 Apr 2017 19:24:10 +0000 (19:24 +0000)]
Merge "Add content description to the master switch toggle button." into oc-dev
Fan Zhang [Fri, 28 Apr 2017 17:58:41 +0000 (10:58 -0700)]
Don't hide network reset even if it's disabled by admin.
Change-Id: Ib78a3c9434c8543f3be34932264802f1065cc54b
Fix:
37134598
Test: robotests
Bartosz Fabianowski [Fri, 28 Apr 2017 15:25:44 +0000 (15:25 +0000)]
Merge "Fix a11y issues on the DO Disclosures page" into oc-dev
am:
1871806fbe
Change-Id: I23a370dca49f5351e5ea4448386840bbc1ef81a3
TreeHugger Robot [Fri, 28 Apr 2017 15:20:08 +0000 (15:20 +0000)]
Merge "Fix a11y issues on the DO Disclosures page" into oc-dev
Felipe Leme [Fri, 28 Apr 2017 03:05:54 +0000 (03:05 +0000)]
Merge "Check for permission when displaying AutofilLServices." into oc-dev
am:
5d27ad49a3
Change-Id: Iaf0b47c41ca879a88438f3a15fc7a6ab345236c1
TreeHugger Robot [Fri, 28 Apr 2017 02:50:03 +0000 (02:50 +0000)]
Merge "Check for permission when displaying AutofilLServices." into oc-dev
Fan Zhang [Fri, 28 Apr 2017 00:07:42 +0000 (00:07 +0000)]
Merge "Merge pointer/tts categories into one without heading" into oc-dev
am:
4f4fe03a6e
Change-Id: I0b333f0823ebd78f53a6f4be4707c5b77ca16a0e
Anton Philippov [Fri, 28 Apr 2017 00:07:20 +0000 (00:07 +0000)]
Merge "Add summary for Backup menu in Settings." into oc-dev
am:
646d996865
Change-Id: I34cd8a9ab8482f287ea36051242df501e7efb0b0
Glen Kuhne [Fri, 28 Apr 2017 00:07:00 +0000 (00:07 +0000)]
Merge "Disable submit button when PSK pass is invalid" into oc-dev
am:
35cc22fcf2
Change-Id: I85453268629231b8c3003b207e4edbf70c140ee2
Doris Ling [Fri, 28 Apr 2017 00:06:38 +0000 (00:06 +0000)]
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
am:
64857437a4
Change-Id: Ifa91856e910de3df6f695d1a31462ca8edda0822
Doris Ling [Fri, 28 Apr 2017 00:06:18 +0000 (00:06 +0000)]
Merge "Add summary to special app access." into oc-dev
am:
02619a6d9f
Change-Id: Iafd970711e33556aeead681128aaeda5046df34b
Sudheer Shanka [Fri, 28 Apr 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
am:
f64c5236c7
Change-Id: Id4d543b5ff4a8abbb0356b7cd97ffe99bdc6540a
Fan Zhang [Thu, 27 Apr 2017 23:33:59 +0000 (23:33 +0000)]
Merge "Merge pointer/tts categories into one without heading" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:20:28 +0000 (23:20 +0000)]
Merge "Add summary for Backup menu in Settings." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:11:46 +0000 (23:11 +0000)]
Merge "Disable submit button when PSK pass is invalid" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:08:19 +0000 (23:08 +0000)]
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:31:47 +0000 (22:31 +0000)]
Merge "Add summary to special app access." into oc-dev
Doris Ling [Thu, 27 Apr 2017 22:09:21 +0000 (15:09 -0700)]
Add content description to the master switch toggle button.
Set the preference title as the toggle button's content description, so
that when user focus on the button, it will read the lable as well on
top of just "switch on" or "switch off".
Change-Id: Id1954fd54b7d38cb4e75d8b3e49d05ee694e0e41
Fix:
37618855
Test: make RunSettingsRoboTests
Anton Philippov [Fri, 21 Apr 2017 09:15:52 +0000 (10:15 +0100)]
Add summary for Backup menu in Settings.
'On'/'Off' depending on whether the backup is enabled in settings.
Refactors BackupSettingsActivity to be shown on System fragment via
xml/PreferenceController instead of category in the manifest.
Bug:
36891827
Test: make RunSettingsRoboTests
Change-Id: I61425fed4d63055c6c386be38792ae074aa72679
Fan Zhang [Thu, 27 Apr 2017 19:43:42 +0000 (12:43 -0700)]
Merge pointer/tts categories into one without heading
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix:
35960300
Test: robotests
Sudheer Shanka [Thu, 27 Apr 2017 20:46:07 +0000 (20:46 +0000)]
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
Matthew Fritze [Thu, 27 Apr 2017 19:55:29 +0000 (19:55 +0000)]
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
am:
b48e6e46b3
Change-Id: I8aedf3695394a296cb1b1ea7111232c6d25aa07a
TreeHugger Robot [Thu, 27 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
Matthew Fritze [Thu, 13 Apr 2017 20:08:33 +0000 (13:08 -0700)]
Remove search duplicates for Wifi and Bluetooth
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
Maurice Lam [Thu, 27 Apr 2017 19:34:08 +0000 (19:34 +0000)]
Fix Robolectric test on oc-dev. DO NOT MERGE
am:
8352421baa
Change-Id: I09a285e1c6ed2c9b27e41b37569922cf648044dd
Maurice Lam [Thu, 27 Apr 2017 18:58:12 +0000 (11:58 -0700)]
Fix Robolectric test on oc-dev. DO NOT MERGE
The directories for setup wizard lib renamed on master.
Test: cd tests/robotests && mma
Bug:
37745541
Change-Id: Iffb7aa85a41a1d84c17357144f964e1d6da693be
Ajay Panicker [Thu, 27 Apr 2017 17:18:50 +0000 (17:18 +0000)]
Merge "Limit btsnoop file size (4/8)" am:
7baae2a924 am:
7469ff3e1c
am:
2151ee9b86
Change-Id: I5199a59ae071fa654477e0b5d8968cddc87cff5a
Ajay Panicker [Thu, 27 Apr 2017 17:08:48 +0000 (17:08 +0000)]
Merge "Limit btsnoop file size (4/8)" am:
7baae2a924
am:
7469ff3e1c
Change-Id: I34175cce212bd5c291481bee5758501b741f197c
Ajay Panicker [Thu, 27 Apr 2017 17:06:18 +0000 (17:06 +0000)]
Merge "Limit btsnoop file size (4/8)"
am:
7baae2a924
Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
Treehugger Robot [Thu, 27 Apr 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Limit btsnoop file size (4/8)"
Bartosz Fabianowski [Wed, 26 Apr 2017 15:37:02 +0000 (17:37 +0200)]
Fix a11y issues on the DO Disclosures page
This CL makres on-actionable preferences on the DO Disclosures page
as selectable=false.
Bug:
37710449
Test: make RunSettingsRoboTests
Change-Id: Ida9c7e1db2a7ea2a1370280d670a42b8a95f21d6
Philip P. Moltmann [Thu, 27 Apr 2017 16:56:20 +0000 (16:56 +0000)]
Merge "Don't show autofill settings if not enabled" into oc-dev
am:
32d3d383cb
Change-Id: I58a04882f08402e77f0e5e4c9d0b183a8a2679da
TreeHugger Robot [Thu, 27 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Don't show autofill settings if not enabled" into oc-dev