Miao Miao (苗苗)
d0cb54b27e
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2
...
am: b1480c8cab
2017-05-02 17:48:41 +00:00
Miao Miao (苗苗)
b1480c8cab
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
...
am: c6e3467cc2
2017-05-02 17:46:41 +00:00
Miao Miao (苗苗)
c6e3467cc2
Merge "Settings crash when receiving data state broadcast"
...
am: 2ed42d009b
2017-05-02 17:44:08 +00:00
Matthew Fritze
4f198813ed
Prevent empty non-Indexable keys from being added
...
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes: 37646265
Test: make RunSettingsRoboTests
2017-05-02 10:42:07 -07:00
Treehugger Robot
2ed42d009b
Merge "Settings crash when receiving data state broadcast"
2017-05-02 17:39:45 +00:00
Kevin Chyn
19323ca297
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
...
am: f1f35ee107
2017-05-02 17:16:09 +00:00
TreeHugger Robot
f1f35ee107
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
2017-05-02 17:12:22 +00:00
Daniel Nishi
854acc9e4b
Merge "Filter on volume for category storage view." into oc-dev
...
am: a41a190ac3
2017-05-02 17:07:02 +00:00
Daniel Nishi
88c721116b
Merge "Tweak spacing for horizontal preferences." into oc-dev
...
am: b4937f4556
2017-05-02 17:06:36 +00:00
Daniel Nishi
a41a190ac3
Merge "Filter on volume for category storage view." into oc-dev
2017-05-02 17:03:36 +00:00
Daniel Nishi
b4937f4556
Merge "Tweak spacing for horizontal preferences." into oc-dev
2017-05-02 17:03:13 +00:00
Jeremy Joslin
9dd363847c
Allow "None" to be selected as a Network rating provider.
...
Updated the picker to always provide "None" as an option. The
preference is only disabled if there a no valid scorers installed.
Existing tests updated and new tests added.
Bug: 37722313
Test: make RunSettingsRoboTests -j40
Test: manual on device clicking.
Change-Id: Ie6fd9f29e0ea3c64845dd98ce1d117013f50c86b
2017-05-02 09:12:48 -07:00
The Android Open Source Project
ad5649043e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 23550fdcd3
2017-05-02 15:59:49 +00:00
TreeHugger Robot
23550fdcd3
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-02 15:46:55 +00:00
The Android Open Source Project
e59cd40c54
Import translations. DO NOT MERGE
...
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
2017-05-02 02:06:19 -07:00
Kevin Chyn
5e6b804301
Revert "Swipe for notification should be default-on in settings app"
...
This reverts commit a95c2c3a8d
2017-05-02 06:49:17 +00:00
Kevin Chyn
f921f8e77e
Merge "Swipe for notification should be default-on in settings app" into oc-dev
...
am: 9ab1318ca8
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
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
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
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
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
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
2017-05-01 23:17:29 +00:00
Jaekyun Seok
f8aaf9ecdc
Merge "Generate license html file from xml files of partitions"
...
am: 04a7e0a73a
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
Daniel Nishi
5aeb6c4fab
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
2017-05-01 15:42:50 -07: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
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
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
Fan Zhang
0e4c59f7f6
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 9c93c28b5a
2017-05-01 20:12:55 +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
Jeff Sharkey
e86e611f76
Merge "Change String to CharSequence in #loadSummary." into oc-dev
...
am: ad597344a2
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
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
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
2017-04-29 06:58:11 +00:00
Fan Zhang
ae112c8a46
Merge "Add emergency broadcast to app & notification settings." into oc-dev
...
am: 908cad27ab
2017-04-29 06:57:43 +00:00
