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
42d0815115
Merge "Update settings main page battery string" into pi-dev
...
am: 681353f725
2018-04-20 17:16:46 -07:00
Fan Zhang
f4687828dd
Merge "Catch exception when failing to create slice"
2018-04-20 23:55:13 +00: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
TreeHugger Robot
cb23de8013
Merge "Add a default title for data_management pref."
2018-04-20 22:27:03 +00:00
Fan Zhang
d57e1b0ed4
Add a default title for data_management pref.
...
Bug: 78347031
Test: robotests in ag/3933037
Change-Id: I4d09c8dd27630caeb5c31a0093350437c676d2fb
2018-04-20 13:57:21 -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
b4127f1481
Collapse notification advanced settings
...
am: 5766d6e443
2018-04-20 12:27:20 -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
60aa99a95c
Merge "Fix crash on rotation" into pi-dev
...
am: 3bdd65e255
2018-04-20 06:42:59 -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
Matthew Fritze
a69121d654
Merge "Update Slice APIs to current versions" into pi-dev
...
am: ff2653a0d8
2018-04-19 20:17:24 -07:00
Salvador Martinez
0724373e16
Merge "Make WifiTether listen to datasaver" into pi-dev
...
am: 96d4cd3c61
2018-04-19 20:11:30 -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
Sundeep Ghuman
f260183895
Merge "Adjust comment on data over usage string." into pi-dev am: 35d1d43bb3
...
am: 99b61ee1ac
2018-04-19 19:29:33 -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
Doris Ling
3160f1cb13
Merge "Fix Network details title not being translated." into pi-dev
...
am: be22830fde
2018-04-19 18:10:17 -07:00
Doris Ling
2e084e25a7
Merge "Fix limit data usage dialog body not being translated." into pi-dev
...
am: 21a34488ba
2018-04-19 18:08:59 -07:00
Sundeep Ghuman
99b61ee1ac
Merge "Adjust comment on data over usage string." into pi-dev
...
am: 35d1d43bb3
2018-04-19 18:06:51 -07:00
Doris Ling
63c051ff41
Merge "Fix App data usage title not being translated." into pi-dev
...
am: 3fff843e57
2018-04-19 17:55:51 -07:00
TreeHugger Robot
be22830fde
Merge "Fix Network details title not being translated." into pi-dev
2018-04-20 00:50:34 +00:00
Salvador Martinez
bef9e8516d
Merge "Update Wifi Tether band selection UI" into pi-dev
...
am: d9abb0e914
2018-04-19 17:46:31 -07: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
TreeHugger Robot
35d1d43bb3
Merge "Adjust comment on data over usage string." into pi-dev
2018-04-20 00:36:43 +00:00
Fan Zhang
92c62ba2eb
Merge "Format number to local locale." into pi-dev
...
am: 0468f68c02
2018-04-19 17:29:26 -07: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
Sundeep Ghuman
201d6ffcdb
Adjust comment on data over usage string.
...
Bug: 75981328
Test: NA
Change-Id: I393ab6637d563a34e9cea2da2b9c29e32efb056f
2018-04-19 16:20:30 -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
