Commit Graph

22270 Commits

Author SHA1 Message Date
TreeHugger Robot
ddd0f98c75 Merge "Use entity header to show account name in sync detail page" 2018-04-23 23:35:23 +00:00
TreeHugger Robot
5f1a6a94cb Merge "Create a new string for keyboard disconnected state" 2018-04-23 23:00:37 +00:00
Fan Zhang
11e8d2f293 Use entity header to show account name in sync detail page
Also removed a bunch of outdated layout and drawables.

Change-Id: I38094d72b84fab1309163f641c4019349f5d6ee7
Fixes: 77657624
Test: visual
2018-04-23 15:25:32 -07:00
Salvador Martinez
f0fce68a9b Merge "Disable hidden network spinner on existing networks" into pi-dev am: ac951a69aa
am: 062dbc2054

Change-Id: I29b27335730594d70805a14ac74d948d6dbef509
2018-04-23 15:11:47 -07:00
Fan Zhang
ee3b74a61f Create a new string for keyboard disconnected state
Change-Id: I454bbb3b8e0ee22c0f7a5a340b86dfd5607de86e
Fixes: 77957016
Test: robotests
2018-04-23 14:59:19 -07:00
TreeHugger Robot
7f48b1293a Merge "TrustAgentSettings use DashboardFragment" 2018-04-23 21:57:05 +00:00
TreeHugger Robot
ac951a69aa Merge "Disable hidden network spinner on existing networks" into pi-dev 2018-04-23 21:38:55 +00:00
Lei Yu
1ddcf81ddc Update insert method for battery database am: 4bfbaa6047
am: 71dca7d131

Change-Id: Id7d1247efd12ead31584e46126108b5370bd1101
2018-04-23 14:37:30 -07:00
Lei Yu
8ae849a8a6 Add primary key for anomaly database. am: 0fcddc77c7
am: 8870486f65

Change-Id: Ic89ea460dd33f740b3c7fe66cd0cbdd4de84e1ad
2018-04-23 14:37:11 -07:00
Mill Chen
fc64a6c8ad TrustAgentSettings use DashboardFragment
- Remove dummy preference from trust_agent_setting.xml.
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.

Bug: 73899467
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.search
Test: atest SettingsGatewayTest UniquePreferenceTest
Change-Id: Ideae0c1e7311d7647cf522e01592822e565a0ff7
2018-04-23 13:36:45 -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
jackqdyulei
02aaca9529 Fix the wrong import
Use androidx.annotation.VisibleForTesting

Test: Build
Change-Id: I666118ac61c6ba36391203af0a5b51dc02024793
2018-04-23 11:17:52 -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
TreeHugger Robot
b1f1ebad89 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" 2018-04-23 17:48:12 +00:00
Lei Yu
fca1b345cc Merge "Fix bugs in auto restriction." into pi-dev am: f6e2c19fcc
am: a9e4d4a42a

Change-Id: If82969696eb492ea3875a0e0fb92f038024f00f9
2018-04-23 10:13:31 -07:00
Lei Yu
58625937e3 Merge "Fix the bug using wrong TimeUnit" into pi-dev am: 10280a53b0
am: a4ef6f51be

Change-Id: I6585d866d4a8e2c54783a874d09821dc727e4941
2018-04-23 10:12:29 -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
2548326afc Merge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3
am: 0bdd7cf4f2

Change-Id: Id9c0d04e816f891df7e180974af104edac04905e
2018-04-23 09:51:49 -07:00
TreeHugger Robot
bb839f81e3 Merge "Pick default notification setting for work profile" into pi-dev 2018-04-23 16:38:43 +00:00
Matthew Fritze
04926f35b7 Merge "Add keywords to Slices" into pi-dev am: 2f911e2e9e
am: 21521826d9

Change-Id: I38d9efabcdecf3c40f1af28ecd167e58c2586ca7
2018-04-20 20:27:02 -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
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
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
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
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
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

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

Change-Id: I02a301bd9a83491acdf3c76e94a15253a3191e83
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
irisykyang
febf094fbc Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug: 77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
2018-04-20 11:23:39 +00:00
Matthew Fritze
13365e83c0 Merge "Update Slice APIs to current versions" into pi-dev am: ff2653a0d8
am: a69121d654

Change-Id: I6ca82c2b9b83c6cbb623548eee3aa910b4c59687
2018-04-19 20:33:41 -07:00
Salvador Martinez
07c11d36e2 Merge "Make WifiTether listen to datasaver" into pi-dev am: 96d4cd3c61
am: 0724373e16

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

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

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

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

Change-Id: I088a291c8d936c6e321883d9a35746b42db1df3b
2018-04-19 18:13:58 -07:00
Fan Zhang
e537da877b Merge "Format number to local locale." into pi-dev am: 0468f68c02
am: 92c62ba2eb

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