Commit Graph

45041 Commits

Author SHA1 Message Date
Lei Yu
8870486f65 Add primary key for anomaly database.
am: 0fcddc77c7

Change-Id: I92c7aae2bf77c31863fa1f8191bec104f73097b4
2018-04-23 14:27:59 -07:00
Lei Yu
4bfbaa6047 Update insert method for battery database
1. Add conflict code to ignore the confliction and return -1 when
insert fails.
2. Add boolean return value to show whether insert sucessfully
3. Add unit test. We don't write robo test because robolectirc use
"update" to shadow "insert" operation, which returns the wrong data.

Bug: 77968649
Test: SettingsUnitTest
Change-Id: Ibd3b53cdb1796d74ea4a2ca1f067e2b302b939e9
2018-04-23 13:13:56 -07:00
Lei Yu
0fcddc77c7 Add primary key for anomaly database.
In this case it won't insert the duplicate data. We don't do migration since
anomaly database only contains transient data.

Bug: 77968649
Test: test still pass
Change-Id: I638564d89ead008ec184b9a4db137436d47df5bc
2018-04-23 13:08:33 -07:00
Salvador Martinez
35b76437e0 Disable hidden network spinner on existing networks
We only want this to be modifiable if you are adding a network
manually, so this CL disables it for existing networks. You
can still see what the spinner is set to though.

Test: robotests
Bug: 78436456
Change-Id: If660e432eca2dabf5bd16881368657ee89fe5a57
2018-04-23 10:50:22 -07:00
Lei Yu
69c370f594 Don't show high usage tip when device is charing
The summary is "Battery may run out soon", it doesn't make sense
when device is charging.

Change-Id: I27394c8a75dac4dcad171e5e215102d39cb33546
Fixes: 78261389
Test: RunSettingsRoboTests
2018-04-23 10:10:20 -07:00
Lei Yu
a9e4d4a42a Merge "Fix bugs in auto restriction." into pi-dev
am: f6e2c19fcc

Change-Id: I2fd187d163c789ade85c40e00d44f58fea18d0be
2018-04-23 10:09:08 -07:00
Lei Yu
a4ef6f51be Merge "Fix the bug using wrong TimeUnit" into pi-dev
am: 10280a53b0

Change-Id: I8d90eec324ddfcb0123247e2e0e37aa6f6f94ab8
2018-04-23 10:08:33 -07:00
Lei Yu
f6e2c19fcc Merge "Fix bugs in auto restriction." into pi-dev 2018-04-23 17:03:39 +00:00
Lei Yu
10280a53b0 Merge "Fix the bug using wrong TimeUnit" into pi-dev 2018-04-23 16:59:47 +00:00
Pavel Grafov
0bdd7cf4f2 Merge "Pick default notification setting for work profile" into pi-dev
am: bb839f81e3

Change-Id: I8ccd32b12b9da892b5f38d4a95e3217bc8183dcc
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
993bc3fcc6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 77e716e463  -s ours

Change-Id: I9696a4c10e97d66c36a4eaca2c1947cb528ecb01
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
Fan Zhang
f060f89b6f Merge "Catch exception when failing to create slice" into pi-dev
am: 524babb389

Change-Id: Iecb03d8889bb0a1b6f6f43f3b28070bfcc429dff
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
Matthew Fritze
21521826d9 Merge "Add keywords to Slices" into pi-dev
am: 2f911e2e9e

Change-Id: I55871dd10278feab58ec1ff6faf3f3bd672d9e68
2018-04-20 17:44:13 -07:00
Salvador Martinez
42d0815115 Merge "Update settings main page battery string" into pi-dev
am: 681353f725

Change-Id: I5a56820ac50ebc322f1352767cfc6fdfe773b292
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
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
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
Jeff Sharkey
b9a1ebcb45 Increase volume search timeout, fix dialog flow.
Slower devices can take longer to process kernel events, so try up
to 25 times (~6 seconds) to find the volume after the partitioning
is finished.

Fix bug where we'd finish() while trying to show the format
confirmation dialog, meaning users couldn't format corrupted
non-primary volumes.

Bug: 74129968, 77849654, 74132243
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I91144051cb6de0cd944d93b03dc5127676e24be8
2018-04-20 14:34:31 -06:00
Lei Yu
252d4e1fc0 Fix bugs in auto restriction.
1. Dismiss this tip once user clicks it and goes to detail page.
2. In auto restriction, since apps are automatically restricted,
we need to remove apps in list that unrestricted by user.
3. Refactor the code to remove the unnecessary parameter(i.e.
SettingsActivity)

Bug: 78187414
Test: RunSettingsRoboTests
Change-Id: I1c950f7c55df35795641c2ea8579ce9e011dba28
2018-04-20 12:55:53 -07:00
Julia Reynolds
b4127f1481 Collapse notification advanced settings
am: 5766d6e443

Change-Id: I99aca23639a2e9b1562942f4c37aad0aa7088c52
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
Rubin Xu
c33e2a1cef Switch to new checkPasswordHistory method
This is part of the fix that upgrades the hashing of password history
to a more secure design.

Bug: 32826058
Test: manual
Change-Id: Ib022c8db1f7b63f75b69d0177fa5f6be528a83c5
2018-04-20 18:09:59 +01: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
60aa99a95c Merge "Fix crash on rotation" into pi-dev
am: 3bdd65e255

Change-Id: I5dda589d25d114bf3355886c29e6d1325a5250ad
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
a69121d654 Merge "Update Slice APIs to current versions" into pi-dev
am: ff2653a0d8

Change-Id: Id757ea69e9dd2f29ad2f651f0473eeb03d2cca9d
2018-04-19 20:17:24 -07:00
Salvador Martinez
0724373e16 Merge "Make WifiTether listen to datasaver" into pi-dev
am: 96d4cd3c61

Change-Id: Ieb021594b18d10098c5fe50ef6b840c8b8a43e6b
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
3160f1cb13 Merge "Fix Network details title not being translated." into pi-dev
am: be22830fde

Change-Id: Ie2d2e0637b1357b926e22bd82372d573a6c6d06b
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

Change-Id: Ie9920bf102323c716ad99ce5d2157231bab1ca7c
2018-04-19 18:08:59 -07:00
Sundeep Ghuman
99b61ee1ac Merge "Adjust comment on data over usage string." into pi-dev
am: 35d1d43bb3

Change-Id: I702e97cd957cede9f318757dd8f312ff273777c3
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

Change-Id: Idf6dc991d79de90d779cc0a084a210f53e7a99b8
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

Change-Id: Ib69cf5155195408170f6eaebd271a32c774e2bbd
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

Change-Id: I946d9b8b18762a8047dafbbe938cd47a2c29c4f2
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
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