Salvador Martinez
fbdc2f2e5e
resolve merge conflicts of 42d0815115 to master
...
Change-Id: I949e09de6aade8d07857a2b8d4bd34a549795939
Bug: None
Test: I solemnly swear I tested this conflict resolution
2018-04-20 18:10:13 -07:00
Salvador Martinez
681353f725
Merge "Update settings main page battery string" into pi-dev
2018-04-20 23:27:25 +00:00
Fan Zhang
2a7fcc4d6f
Catch exception when failing to create slice
...
- Created a non-generic exception type when failing SliceData.build()
- Catch exception and log error instead of crash.
- Added a presubmit test
Fixes: 78347031
Test: robotests, atest
Change-Id: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
2018-04-20 15:46:35 -07:00
Aurimas Liutikas
e0069d332d
Migrate Settings to androidx.
...
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Julia Reynolds
538a4594ff
Collapse notification advanced settings am: 5766d6e443
...
am: b4127f1481
2018-04-20 12:41:02 -07:00
Julia Reynolds
5766d6e443
Collapse notification advanced settings
...
Leave footers visible outside of advanced
Test: visual inspection
Fixes: 77324998
Fixes: 38011858
Change-Id: I2d6fcb832b134bc97081f03a3ab38d593e943f76
2018-04-20 13:24:45 -04:00
Julia Reynolds
cf326a0375
Merge "Fix crash on rotation" into pi-dev am: 3bdd65e255
...
am: 60aa99a95c
2018-04-20 06:51:54 -07:00
Julia Reynolds
3bdd65e255
Merge "Fix crash on rotation" into pi-dev
2018-04-20 13:30:28 +00:00
Matthew Fritze
13365e83c0
Merge "Update Slice APIs to current versions" into pi-dev am: ff2653a0d8
...
am: a69121d654
2018-04-19 20:33:41 -07:00
Salvador Martinez
07c11d36e2
Merge "Make WifiTether listen to datasaver" into pi-dev am: 96d4cd3c61
...
am: 0724373e16
2018-04-19 20:20:39 -07:00
TreeHugger Robot
ff2653a0d8
Merge "Update Slice APIs to current versions" into pi-dev
2018-04-20 03:11:14 +00:00
TreeHugger Robot
96d4cd3c61
Merge "Make WifiTether listen to datasaver" into pi-dev
2018-04-20 02:57:04 +00:00
Salvador Martinez
7ba65c39ae
Make WifiTether listen to datasaver
...
Wifi Tethering is already turned off when appropriate. However
if you re-enable it you still can't toggle the tether switchbar.
This CL makes it so that if you disable data saver the toggle
becomes enabled again.
Test: robotests
Bug: 77860936
Change-Id: I03fa74c21674678a90cde7bd20fa68167f02ae3c
2018-04-20 02:56:47 +00:00
Doris Ling
284bf9264c
Merge "Fix Network details title not being translated." into pi-dev am: be22830fde
...
am: 3160f1cb13
2018-04-19 19:33:15 -07:00
Doris Ling
2cde793fd5
Merge "Fix limit data usage dialog body not being translated." into pi-dev am: 21a34488ba
...
am: 2e084e25a7
2018-04-19 19:31:28 -07:00
Doris Ling
d82413c9e6
Merge "Fix App data usage title not being translated." into pi-dev am: 3fff843e57
...
am: 63c051ff41
2018-04-19 19:19:01 -07:00
Salvador Martinez
adebfe35a9
Merge "Update Wifi Tether band selection UI" into pi-dev am: d9abb0e914
...
am: bef9e8516d
2018-04-19 18:13:58 -07:00
Fan Zhang
e537da877b
Merge "Format number to local locale." into pi-dev am: 0468f68c02
...
am: 92c62ba2eb
2018-04-19 18:13:21 -07:00
TreeHugger Robot
be22830fde
Merge "Fix Network details title not being translated." into pi-dev
2018-04-20 00:50:34 +00:00
TreeHugger Robot
21a34488ba
Merge "Fix limit data usage dialog body not being translated." into pi-dev
2018-04-20 00:43:58 +00:00
Matthew Fritze
f9f72e8c2c
Update Slice APIs to current versions
...
Change-Id: Icf40673e518534487be77f33427df937717735e5
Fixes: 77982356
Test: robotests
2018-04-19 17:29:18 -07:00
TreeHugger Robot
3fff843e57
Merge "Fix App data usage title not being translated." into pi-dev
2018-04-20 00:18:27 +00:00
TreeHugger Robot
2bc391bb09
Merge "Remove LockdownButtonPreferenceController from java"
2018-04-20 00:16:43 +00:00
TreeHugger Robot
d9abb0e914
Merge "Update Wifi Tether band selection UI" into pi-dev
2018-04-20 00:15:45 +00:00
Fan Zhang
0468f68c02
Merge "Format number to local locale." into pi-dev
2018-04-20 00:01:01 +00:00
Doris Ling
dad557305e
Fix Network details title not being translated.
...
- use the title resource id instead of the actual string in the launch
intent so that it can react to language change.
Change-Id: I424dc026a9298d12627c05f97f27e9d4cba5a341
Fixes: 77896130
Test: run i18nscreenshots
2018-04-19 16:49:35 -07:00
Doris Ling
689bb2c27c
Fix limit data usage dialog body not being translated.
...
- need to pass the resource id instead of the text when building the
dialog in order for it to react to language change.
- also remove the unnecessary set/get the body message in the dialog
creation since the msg id can be used directly.
Change-Id: I399dcda54961fac457fc5f0fad9082f2c1e1a2b2
Fixes: 77897157
Test: run i18nscreenshots
2018-04-19 16:35:28 -07:00
Doris Ling
6784296248
Fix App data usage title not being translated.
...
- we need to pass the title resource id instead of the actual text in
the launch intent in order for it react to language change properly.
Change-Id: I72ccbe67411c9f4da328dd24671f4e71ab927851
Fixes: 77898325
Test: run i18nscreenshots
2018-04-19 16:09:58 -07:00
Fan Zhang
040df90c50
Format number to local locale.
...
Change-Id: Iffa91eb8c40f09e5ac4cce10f355e348e62d8fce
Fixes: 78134172
Test: robotests
2018-04-19 15:54:39 -07:00
TreeHugger Robot
f9a768d6c3
Merge "Migrate LegalSettings to DashboardFragment"
2018-04-19 22:36:09 +00:00
Fan Zhang
e136bb550e
Remove LockdownButtonPreferenceController from java
...
It's already registered in xml.
Change-Id: I9b363e0d7543fd8139b4e4e65e11d567cbf2ae70
Fixes: 78299993
Test: robotests
2018-04-19 22:13:42 +00:00
Yanting_Yang
42513afac0
Migrate LegalSettings to DashboardFragment
...
- CopyrightPreferenceController
- LegalPreferenceController
- LicensePreferenceController
- TermsPreferenceController
- WallpaperAttributionsPreferenceController
- WebViewLicensePreferenceController
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=CodeInspectionTest
atest UniquePreferenceTest
Change-Id: I28108eb926f9efec63390c2354cb0ebc0a785ec2
2018-04-19 14:42:00 -07:00
rafftsai
c43f9f594f
Change base fragment to InstrumentedFragment
...
- Modify PrivateVolumeForget, PrivateVolumeFormat, PrivateVolumeUnmount
- Add ShadowStorageManager
- Add test cases
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
Change-Id: I6883dd12cec00abbc3099bf31d285e6fe455eba6
2018-04-19 21:27:13 +00:00
Salvador Martinez
10ba9c1786
Update Wifi Tether band selection UI
...
This CL updates the preference for selecting the enabled tether bands
to allow individual selection of multiple bands instead of forcing
a single selection. Note that while this makes the UI theoretically
support new bands in the future, the wifi backend only supports
selecting a single band or all bands which this CL does not address.
Test: robotests
Bug: 73102003
Change-Id: Ib2d4a2834c5cd11875515d308f7b20bfc8471959
2018-04-19 13:37:09 -07:00
Salvador Martinez
9d03322d2c
Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
...
am: c1b16f62ad
2018-04-19 13:25:14 -07:00
Jeff Sharkey
de7d61b301
Merge "Find graceful description when missing disk." into pi-dev am: 676e86d7fa
...
am: c890ca54ee
2018-04-19 13:11:29 -07:00
Salvador Martinez
dbe38b09cf
Merge "Fix restricted fragment dialogs" into pi-dev
2018-04-19 20:09:08 +00:00
Jeff Sharkey
676e86d7fa
Merge "Find graceful description when missing disk." into pi-dev
2018-04-19 20:03:24 +00:00
Lei Yu
646698c7ab
Merge "update checkbox based on FAS API" into pi-dev am: cff99cc2e3
...
am: bbf793460b
2018-04-19 10:47:22 -07:00
Beverly Tai
83cbcbb72a
Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
...
am: ee3164bd42
2018-04-19 10:30:43 -07:00
Lei Yu
cff99cc2e3
Merge "update checkbox based on FAS API" into pi-dev
2018-04-19 17:01:23 +00:00
Beverly Tai
48831c837f
Merge "Can disable checkbox without tint on text" into pi-dev
2018-04-19 16:57:05 +00:00
Jeff Sharkey
d98de2e2da
Find graceful description when missing disk.
...
Certain volumes (like internal storage) don't have a corresponding
DiskInfo object, so we need to fall back to using the VolumeInfo
description instead.
Bug: 77991425
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I92d377035b6028dd31527100da54bfb1d1828ae9
2018-04-19 09:45:31 -06:00
Julia Reynolds
e2897aedf5
Fix crash on rotation
...
Load app/channel data early so that any open dialogs can be properly
reconstructed. Never call done on an entityheadercontroller with
an activity that's not yet started.
Test: robotests
Change-Id: Ib2b9f8f1985ef038959062204aaceff686f4ebcf
Fixes: 74114917
2018-04-19 10:17:23 -04:00
Jason Monk
8aa0365d97
Merge "Fix wifi launch intent" into pi-dev am: 7f50a0c837
...
am: 23ba6152aa
2018-04-19 06:34:46 -07:00
Beverly
49f7f8137f
Can disable checkbox without tint on text
...
Fixes: 76101594
Test: DisabledCheckBoxPreferenceTest, ZenModeVisEffectPreferenceControllerTest
Change-Id: Ida92c7d94f788404d9cd48f07e779446d9ac0d54
2018-04-19 09:27:22 -04:00
TreeHugger Robot
7f50a0c837
Merge "Fix wifi launch intent" into pi-dev
2018-04-19 13:23:20 +00:00
TreeHugger Robot
f89e9e4174
Merge "Modified the PrivacySettings and add PreferenceControllers"
2018-04-19 02:39:28 +00:00
TreeHugger Robot
6280bdb437
Merge "Use ListFormatter to join strings for network dashboard"
2018-04-19 01:51:29 +00:00
Salvador Martinez
950d94f689
Update settings main page battery string
...
UX requested that the percentage be moved to the front.
Test: robotests pass
Bug: 77874406
Change-Id: I7008c81fa42487bb71ecd84b6a66203d89fe50a8
2018-04-18 18:26:36 -07:00
