Commit Graph

35193 Commits

Author SHA1 Message Date
Kevin Chyn
f921f8e77e Merge "Swipe for notification should be default-on in settings app" into oc-dev
am: 9ab1318ca8

Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
2017-05-02 04:14:47 +00:00
TreeHugger Robot
9ab1318ca8 Merge "Swipe for notification should be default-on in settings app" into oc-dev 2017-05-02 04:09:31 +00:00
Fan Zhang
403a4ee11a Merge "Update vpn icon from setting gear to vpn key." into oc-dev
am: 74327fa4f0

Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd
2017-05-02 02:28:10 +00:00
TreeHugger Robot
74327fa4f0 Merge "Update vpn icon from setting gear to vpn key." into oc-dev 2017-05-02 02:23:35 +00:00
Amit Mahajan
bd119a71ec Merge "Change to not call update() if APN is not modified." into oc-dev
am: 7cab6a9a17

Change-Id: I7ae69ec7797f10e0d48a4ce7d1b3a80c18851911
2017-05-02 02:07:38 +00:00
TreeHugger Robot
7cab6a9a17 Merge "Change to not call update() if APN is not modified." into oc-dev 2017-05-02 01:59:38 +00:00
Jaekyun Seok
4a6781af1b Merge "Do not show static overlays as a theme" into oc-dev
am: 170acdb79b

Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa
2017-05-02 01:15:01 +00:00
TreeHugger Robot
170acdb79b Merge "Do not show static overlays as a theme" into oc-dev 2017-05-02 01:03:54 +00:00
Jesse Evans
34e0c7afdf Merge "Hides app buttons for instant apps" into oc-dev
am: 965508fc3e

Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
2017-05-02 00:34:02 +00:00
TreeHugger Robot
965508fc3e Merge "Hides app buttons for instant apps" into oc-dev 2017-05-02 00:29:00 +00:00
Jaekyun Seok
33d77b09a6 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a am: f8aaf9ecdc
am: 8b5389f707

Change-Id: Id42eb0a0ea330c5758e4a77a31158b7dd26256b5
2017-05-01 23:21:06 +00:00
Jaekyun Seok
8b5389f707 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc

Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
2017-05-01 23:17:29 +00:00
Jaekyun Seok
f8aaf9ecdc Merge "Generate license html file from xml files of partitions"
am: 04a7e0a73a

Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
2017-05-01 23:15:34 +00:00
Treehugger Robot
04a7e0a73a Merge "Generate license html file from xml files of partitions" 2017-05-01 23:08:19 +00:00
Jaekyun Seok
fa0242c2e3 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 74812873f4)
2017-05-01 22:10:06 +00:00
Daniel Nishi
e25371e8bc Merge "Make the storage free/total sizes consistent." into oc-dev
am: b22c11ae28

Change-Id: Ibee39375f0c714f5ff7578c24f78a387cd54bc44
2017-05-01 21:46:50 +00:00
Daniel Nishi
b22c11ae28 Merge "Make the storage free/total sizes consistent." into oc-dev 2017-05-01 21:40:23 +00:00
Jaekyun Seok
d3d3310ee2 Merge "Generate license html file from xml files of partitions" into oc-dev
am: 7f59081421

Change-Id: Ia027639c81093af0defff40f2e85ddb499093652
2017-05-01 21:27:01 +00:00
TreeHugger Robot
7f59081421 Merge "Generate license html file from xml files of partitions" into oc-dev 2017-05-01 21:22:19 +00:00
Jaekyun Seok
ef85d880a5 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
2017-05-02 06:18:48 +09:00
Kevin Chyn
a95c2c3a8d 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
2017-05-01 13:28:35 -07: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
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
Jeff Sharkey
ad597344a2 Merge "Change String to CharSequence in #loadSummary." into oc-dev 2017-05-01 17:52:27 +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
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
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
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
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
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