Lei Yu
58625937e3
Merge "Fix the bug using wrong TimeUnit" into pi-dev am: 10280a53b0
...
am: a4ef6f51be
2018-04-23 10:12:29 -07:00
Lei Yu
a4ef6f51be
Merge "Fix the bug using wrong TimeUnit" into pi-dev
...
am: 10280a53b0
2018-04-23 10:08:33 -07:00
Lei Yu
10280a53b0
Merge "Fix the bug using wrong TimeUnit" into pi-dev
2018-04-23 16:59:47 +00:00
Pavel Grafov
2548326afc
Merge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3
...
am: 0bdd7cf4f2
2018-04-23 09:51:49 -07:00
Pavel Grafov
0bdd7cf4f2
Merge "Pick default notification setting for work profile" into pi-dev
...
am: bb839f81e3
2018-04-23 09:48:26 -07:00
TreeHugger Robot
bb839f81e3
Merge "Pick default notification setting for work profile" into pi-dev
2018-04-23 16:38:43 +00:00
Bill Yi
159a9d3b42
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 77e716e463 -s ours
...
am: 993bc3fcc6
2018-04-20 22:17:53 -07:00
Bill Yi
993bc3fcc6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 77e716e463
2018-04-20 22:13:51 -07:00
TreeHugger Robot
77e716e463
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-21 05:09:44 +00:00
TreeHugger Robot
cc821bc131
Merge "Import translations. DO NOT MERGE"
2018-04-21 04:58:43 +00:00
Fan Zhang
b1a9222dfb
[automerger skipped] Merge "Catch exception when failing to create slice" into pi-dev am: 524babb389
...
am: f060f89b6f
2018-04-20 20:37:34 -07:00
Matthew Fritze
04926f35b7
Merge "Add keywords to Slices" into pi-dev am: 2f911e2e9e
...
am: 21521826d9
2018-04-20 20:27:02 -07:00
Fan Zhang
f060f89b6f
Merge "Catch exception when failing to create slice" into pi-dev
...
am: 524babb389
2018-04-20 19:24:45 -07:00
TreeHugger Robot
524babb389
Merge "Catch exception when failing to create slice" into pi-dev
2018-04-21 02:03:49 +00:00
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
Matthew Fritze
21521826d9
Merge "Add keywords to Slices" into pi-dev
...
am: 2f911e2e9e
2018-04-20 17:44: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
0e5a3273af
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
Merged-In: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
2018-04-20 23:55:39 +00:00
Fan Zhang
f4687828dd
Merge "Catch exception when failing to create slice"
2018-04-20 23:55:13 +00:00
Lei Yu
4c94926ba5
Fix the bug using wrong TimeUnit
...
It should use DAYS, not HOURS.
Change-Id: I26784822c86e58cad93d35b6772ea54af7efb8f5
Fixes: 78362305
Test: RunSettingsRoboTests
2018-04-20 16:45:02 -07:00
TreeHugger Robot
2f911e2e9e
Merge "Add keywords to Slices" into pi-dev
2018-04-20 23:30:18 +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
Matthew Fritze
47a44e8fa4
Add keywords to Slices
...
Attach the keywords used for Settings search to Slices.
Their primary use is helping match synonyms for presenters
which display slices without explicit Uri requests, like a launcher.
This changes:
- Updates database scheme
- Adds to SliceData object
- Grab keywords in the SliceDataConverter
- Set keywords on all slices
Test: robotests
Change-Id: I16c40d2380ffddaf0a87fb1b9cd58e95573b308f
Fixes: 78306195
2018-04-20 14:50:55 -07: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
Bill Yi
4bcbd46e0d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I93f8c6f0051cf15e218d1c761c300c7e16109165
2018-04-20 10:37:50 -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
Bill Yi
e73aef30bf
Import translations. DO NOT MERGE
...
Change-Id: Ie22a4a96e3ffdd81b95d4aee14fa619dd9e231a1
Auto-generated-cl: translation import
2018-04-20 09:59:18 -07:00
Pavel Grafov
c29b984a98
Pick default notification setting for work profile
...
Managed profiles cannot completely hide notifications, so
this setting should be treated as always "true" for them.
Change-Id: I9808c1e9736d83efccb0e947d9097379bda59ebb
Fixes: 78194020
Test: atest RedactionInterstitialTest
2018-04-20 16:29:37 +01: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
