Commit Graph

36038 Commits

Author SHA1 Message Date
Evan Laird
227affaf29 Cleanup to screensaver settings for O
Reworked the way screensaver settings are laid out for O. Instead of
using the options menu and dialogs to navigate screensaver options,
there are now two rows: one row for the screensaver choice and
optionally its own settings, and one row for the "when to show" setting.
And now there's a nice obvious button you can press to preview your
choices.

Test: 'export ROBOTEST_FILTER="RadioButtonListFragmentTest";\
mmm -j20 packages/apps/Settings/tests/robotests'

Bug: 35031991
Change-Id: Ie7d2055fb45f6dfe72e34cb9598d9a25f7bee75a
2017-05-01 20:08:16 +00:00
Fan Zhang
8ad5eb4894 Use preference supported attr to reserve icon space
Change-Id: I28c36f44e6db91fba9aaa5a260303c873a684a5f
Fix: 37572422
Test: runtest android.settings.functional.DisplaySettingsTest
2017-05-01 13:02:48 -07:00
TreeHugger Robot
e6c87c4684 Merge "Revert "Use framework support to reserve icon space"" 2017-05-01 19:48:47 +00:00
Jeff Sharkey
4869effb72 Merge "Change String to CharSequence in #loadSummary." into oc-dev am: ad597344a2
am: e86e611f76

Change-Id: Id13f41ae6cb32d575193732136489bbac0702a3c
2017-05-01 18:22:36 +00:00
Jesse Evans
0d7854aa43 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
2017-05-01 11:12:52 -07:00
Fan Zhang
04b96110e1 Revert "Use framework support to reserve icon space"
This causes DropdownPreference to crash

Bug: 37850881
This reverts commit 19f5783b75.

Change-Id: Iaa2ceb1a031e8e0b62bc886d908534f3b53d3835
2017-05-01 18:11:59 +00:00
Jeff Sharkey
e86e611f76 Merge "Change String to CharSequence in #loadSummary." into oc-dev
am: ad597344a2

Change-Id: Id636a6558f38673749255d01a30190fa762b7619
2017-05-01 18:10:45 +00:00
Daniel Sheng
b74914eff3 Fixed crash when opening Camera Lift suggestion
Bug: 37742959
Test: manual + make RunSettingsRoboTests +
      adb shell am instrument -w com.android.settings.tests.unit
          /android.support.test.runner.AndroidJUnitRunner

Added missing SettingsGateway entry for Camera Lift Trigger settings
fragment.

Change-Id: Iddce7a672b0bb8430e3c7b3c346788fb23970636
2017-05-01 11:07:34 -07:00
Badhri Jagan Sridharan
c7cd7930ad Add help url for unsupported accessory
Bug: 36604276
Change-Id: I53f0b5e2fd3040f4440aa94e86fe8021239b90e7
2017-05-01 18:04:41 +00:00
Jeff Sharkey
ad597344a2 Merge "Change String to CharSequence in #loadSummary." into oc-dev 2017-05-01 17:52:27 +00:00
Meng Wang
897b93aa8b Merge "Fix typo" 2017-05-01 17:34:34 +00:00
Jesse Evans
b519b67684 Make instant apps appear above disabled apps am: b2d85af91e
am: f52bfd03ea

Change-Id: I1b58da2932103f9879d3eb84c7b55aea2b208509
2017-05-01 17:09:22 +00:00
Jesse Evans
f52bfd03ea Make instant apps appear above disabled apps
am: b2d85af91e

Change-Id: Ie2fe92d08bf8d8697a5bf99add1efc83b8873956
2017-05-01 17:02:27 +00:00
Meng Wang
69439b5e47 Fix typo
eabProvisionedSwitch should use eab_provisioned_switch

Bug: 37433707
Test: make
Change-Id: Iac7c83d1bee34f9e89878b66647115427ad0bf5f
2017-05-01 08:31:14 -07:00
Bill Yi
67589e7afa Merge "Import translations. DO NOT MERGE" 2017-05-01 15:22:28 +00:00
Jesse Evans
b2d85af91e 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
2017-05-01 07:33:25 -07:00
Amit Mahajan
657c237522 Change to not call update() if APN is not modified.
Test: manual
Bug: 37629096
Change-Id: Icd7e61267d724b576edf872485dd1a1e2ab18d46
2017-05-01 06:43:52 -07:00
Fan Zhang
62dfc300ed Update vpn icon from setting gear to vpn key.
Change-Id: Ic135d5e28a0547e949c8170f985e4de26e05ad51
Fix: 37781101
Test: visual
2017-04-29 19:48:06 +00:00
Bill Yi
bdbb57681a Merge "Import translations. DO NOT MERGE" into oc-dev am: 0ee4e7df8e -s ours
am: b40d693aba  -s ours

Change-Id: I948d295e1dbf8f05f53324395425225a5499caa5
2017-04-29 18:08:40 +00:00
Bill Yi
b40d693aba Merge "Import translations. DO NOT MERGE" into oc-dev
am: 0ee4e7df8e  -s ours

Change-Id: I47fd4022a9ba5a639e35c011f83a32559bfaefaa
2017-04-29 18:05:56 +00:00
TreeHugger Robot
0ee4e7df8e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:59:43 +00:00
Fan Zhang
4ed4746baa Merge "Don't hide network reset even if it's disabled by admin." into oc-dev am: b50460086d
am: 5acb03575f

Change-Id: Ie8e346d71eaf4c3617753c83846cbd723582109e
2017-04-29 07:00:01 +00:00
Fan Zhang
5801c66ad7 Merge "Add emergency broadcast to app & notification settings." into oc-dev am: 908cad27ab
am: ae112c8a46

Change-Id: I879f97321c9a3af20a1c8ec2de49c8fcf4bedbe9
2017-04-29 06:59:44 +00:00
Fan Zhang
5acb03575f Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
am: b50460086d

Change-Id: I3d1a1958999aed60b44da454f341ed711a64a589
2017-04-29 06:58:11 +00:00
Fan Zhang
ae112c8a46 Merge "Add emergency broadcast to app & notification settings." into oc-dev
am: 908cad27ab

Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35
2017-04-29 06:57:43 +00:00
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
bf4b1b0261 Merge "Add "add service" pref to the autofill picker" into oc-dev am: 9301381ac2
am: 586b1e4cee

Change-Id: Idc79fbeb391264379d52b452f0f9278181e199bf
2017-04-29 05:32:40 +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
Bill Yi
7f1dee66c1 Import translations. DO NOT MERGE
Change-Id: I6acfc630d4d64eda5b178d9fd85a05040af66409
Auto-generated-cl: translation import
2017-04-28 21:36:08 -07: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
d6fff53610 Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev am: 30e9474dbb
am: 87603385b7

Change-Id: I64197acec6cb6cc055b496198b01c954c4c1907f
2017-04-28 23:43:21 +00:00
TreeHugger Robot
4e2addce97 Merge "Only show "reset app preference" actionbar menu in app info" 2017-04-28 23:28:56 +00: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
TreeHugger Robot
67f691ff07 Merge "Tweak spacing for horizontal preferences." 2017-04-28 22:20:08 +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
ab5b6e7360 Merge "Add content description to the master switch toggle button." into oc-dev am: 10158feecf
am: 79d8e5db66

Change-Id: Ied594a8096175ad340f246af3d467629df687bc1
2017-04-28 19:41:59 +00: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
9c93c28b5a 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
2017-04-28 12:23:30 -07:00
Fan Zhang
d1c41a3064 Only show "reset app preference" actionbar menu in app info
Because it doesn't make sense to show it in other types of app
list view.

Change-Id: Ia4f84812a6f0acc434f770b026e5ed550714087a
Fix: 36110694
Test: robotests
2017-04-28 11:47:54 -07:00
TreeHugger Robot
1e583e5d03 Merge "Add method to check whether to enable anomaly detection" 2017-04-28 18:37:38 +00:00
TreeHugger Robot
082d1d34b0 Merge "Add flag to control whether or not we should tint icons" 2017-04-28 18:16:25 +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