Commit Graph

35565 Commits

Author SHA1 Message Date
TreeHugger Robot
b50460086d Merge "Don't hide network reset even if it's disabled by admin." into oc-dev 2017-04-29 06:53:27 +00:00
TreeHugger Robot
908cad27ab Merge "Add emergency broadcast to app & notification settings." into oc-dev 2017-04-29 06:53:12 +00:00
Philip P. Moltmann
586b1e4cee Merge "Add "add service" pref to the autofill picker" into oc-dev
am: 9301381ac2

Change-Id: Ifde40f13acc2881209231267f5252f5b56c627f1
2017-04-29 05:24:18 +00:00
Philip P. Moltmann
9301381ac2 Merge "Add "add service" pref to the autofill picker" into oc-dev 2017-04-29 05:14:42 +00:00
Saige McVea
2cc818acce 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
2017-04-28 20:35:21 -07:00
Bill Yi
27dc0b5efa Import translations. DO NOT MERGE
Change-Id: I0ae57f3a1b494044e26518590797977fa331a975
Auto-generated-cl: translation import
2017-04-28 19:46:17 -07:00
Jaekyun Seok
74812873f4 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
2017-04-29 09:47:24 +09:00
Fan Zhang
87603385b7 Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
am: 30e9474dbb

Change-Id: Ib72ca3ea03b3fb32d018e1fbad9b697ce5dd1391
2017-04-28 23:24:40 +00:00
TreeHugger Robot
30e9474dbb Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev 2017-04-28 23:08:20 +00:00
Fan Zhang
d53c6d57f3 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
2017-04-28 14:36:17 -07:00
Fan Zhang
293556d6b8 Revert "Display and parse numbers properly in all locales"
Bug: 37311645

This reverts commit 8648c5ed3d.

Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
2017-04-28 21:06:28 +00:00
Philip P. Moltmann
2aff7dbfda 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
2017-04-28 13:57:04 -07:00
Doris Ling
79d8e5db66 Merge "Add content description to the master switch toggle button." into oc-dev
am: 10158feecf

Change-Id: Icc68b53cbbb93755c7ce90db1c4d2f70d5e44cd1
2017-04-28 19:34:34 +00:00
TreeHugger Robot
10158feecf Merge "Add content description to the master switch toggle button." into oc-dev 2017-04-28 19:24:11 +00:00
Fan Zhang
cf96674977 Don't hide network reset even if it's disabled by admin.
Change-Id: Ib78a3c9434c8543f3be34932264802f1065cc54b
Fix: 37134598
Test: robotests
2017-04-28 18:06:16 +00:00
Bookatz
138973683e Add BLE results counter to batterystats
Bug: 37720787
Test: none

Change-Id: Ia5f781cb039256cea7747bb0b731686a7469d103
2017-04-28 09:28:01 -07:00
Bartosz Fabianowski
5c5b801371 Merge "Fix a11y issues on the DO Disclosures page" into oc-dev
am: 1871806fbe

Change-Id: I23a370dca49f5351e5ea4448386840bbc1ef81a3
2017-04-28 15:25:44 +00:00
TreeHugger Robot
1871806fbe Merge "Fix a11y issues on the DO Disclosures page" into oc-dev 2017-04-28 15:20:09 +00:00
Felipe Leme
bb542f0894 Merge "Check for permission when displaying AutofilLServices." into oc-dev
am: 5d27ad49a3

Change-Id: Iaf0b47c41ca879a88438f3a15fc7a6ab345236c1
2017-04-28 03:05:54 +00:00
TreeHugger Robot
5d27ad49a3 Merge "Check for permission when displaying AutofilLServices." into oc-dev 2017-04-28 02:50:04 +00:00
Fan Zhang
98ec71355b Merge "Merge pointer/tts categories into one without heading" into oc-dev
am: 4f4fe03a6e

Change-Id: I0b333f0823ebd78f53a6f4be4707c5b77ca16a0e
2017-04-28 00:07:42 +00:00
Anton Philippov
d1cc1365fc Merge "Add summary for Backup menu in Settings." into oc-dev
am: 646d996865

Change-Id: I34cd8a9ab8482f287ea36051242df501e7efb0b0
2017-04-28 00:07:20 +00:00
Glen Kuhne
7038d26861 Merge "Disable submit button when PSK pass is invalid" into oc-dev
am: 35cc22fcf2

Change-Id: I85453268629231b8c3003b207e4edbf70c140ee2
2017-04-28 00:07:00 +00:00
Doris Ling
42126366f1 Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
am: 64857437a4

Change-Id: Ifa91856e910de3df6f695d1a31462ca8edda0822
2017-04-28 00:06:38 +00:00
Doris Ling
1081882be6 Merge "Add summary to special app access." into oc-dev
am: 02619a6d9f

Change-Id: Iafd970711e33556aeead681128aaeda5046df34b
2017-04-28 00:06:18 +00:00
Sudheer Shanka
e3961b402a Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
am: f64c5236c7

Change-Id: Id4d543b5ff4a8abbb0356b7cd97ffe99bdc6540a
2017-04-28 00:05:53 +00:00
Fan Zhang
4f4fe03a6e Merge "Merge pointer/tts categories into one without heading" into oc-dev 2017-04-27 23:34:00 +00:00
TreeHugger Robot
646d996865 Merge "Add summary for Backup menu in Settings." into oc-dev 2017-04-27 23:20:29 +00:00
TreeHugger Robot
35cc22fcf2 Merge "Disable submit button when PSK pass is invalid" into oc-dev 2017-04-27 23:11:47 +00:00
TreeHugger Robot
64857437a4 Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev 2017-04-27 23:08:20 +00:00
TreeHugger Robot
02619a6d9f Merge "Add summary to special app access." into oc-dev 2017-04-27 22:31:48 +00:00
Doris Ling
e2ad415fdb 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
2017-04-27 15:09:21 -07:00
Anton Philippov
ca5e1bd67b 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
2017-04-27 22:33:52 +01:00
Ajay Panicker
a253e1752f Limit btsnoop file size (4/9)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
2017-04-27 13:51:34 -07:00
Fan Zhang
496fd0ca34 Merge pointer/tts categories into one without heading
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix: 35960300
Test: robotests
2017-04-27 13:47:44 -07:00
Sudheer Shanka
f64c5236c7 Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev 2017-04-27 20:46:16 +00:00
Matthew Fritze
6e4d02fa86 Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
am: b48e6e46b3

Change-Id: I8aedf3695394a296cb1b1ea7111232c6d25aa07a
2017-04-27 19:55:29 +00:00
TreeHugger Robot
b48e6e46b3 Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev 2017-04-27 19:50:31 +00:00
Matthew Fritze
2caaa7420d 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
2017-04-27 12:36:16 -07:00
Maurice Lam
9e7debc8a3 Fix Robolectric test on oc-dev. DO NOT MERGE
am: 8352421baa

Change-Id: I09a285e1c6ed2c9b27e41b37569922cf648044dd
2017-04-27 19:34:08 +00:00
Maurice Lam
8352421baa 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
2017-04-27 12:01:57 -07:00
Ajay Panicker
408bcef41a Merge "Limit btsnoop file size (4/8)" am: 7baae2a924 am: 7469ff3e1c
am: 2151ee9b86

Change-Id: I5199a59ae071fa654477e0b5d8968cddc87cff5a
2017-04-27 17:18:50 +00:00
Ajay Panicker
2151ee9b86 Merge "Limit btsnoop file size (4/8)" am: 7baae2a924
am: 7469ff3e1c

Change-Id: I34175cce212bd5c291481bee5758501b741f197c
2017-04-27 17:08:48 +00:00
Ajay Panicker
7469ff3e1c Merge "Limit btsnoop file size (4/8)"
am: 7baae2a924

Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
2017-04-27 17:06:18 +00:00
Treehugger Robot
7baae2a924 Merge "Limit btsnoop file size (4/8)" 2017-04-27 17:02:05 +00:00
Bartosz Fabianowski
3e30a201d9 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
2017-04-27 19:01:51 +02:00
Philip P. Moltmann
fc656da908 Merge "Don't show autofill settings if not enabled" into oc-dev
am: 32d3d383cb

Change-Id: I58a04882f08402e77f0e5e4c9d0b183a8a2679da
2017-04-27 16:56:20 +00:00
TreeHugger Robot
32d3d383cb Merge "Don't show autofill settings if not enabled" into oc-dev 2017-04-27 16:43:21 +00:00
Pavel Grafov
84c3702050 Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
am: 6e34174f72

Change-Id: Ic19583cb62f8f00831a5564c1f63fa1ede22efb6
2017-04-27 16:34:12 +00:00
TreeHugger Robot
6e34174f72 Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev 2017-04-27 16:23:06 +00:00