Commit Graph

32793 Commits

Author SHA1 Message Date
Amin Shaikh
3aa547b50d Add activity action for Configure Wi-Fi settings.
Bug: 34135303
Test: make -j40 RunSettingsRoboTests
Change-Id: Ieec7a1aa913553c74c6ebf9fb3d868e03e0c3bf6
2017-01-11 18:40:32 +00:00
TreeHugger Robot
c3b80d6a00 Merge "Refactor ConfigureWifiSettings for better testing" 2017-01-11 03:17:09 +00:00
Fan Zhang
925f23244a Refactor ConfigureWifiSettings for better testing
Fix: 34205150
Test: make -j40 RunSettingsRoboTests
Change-Id: I7a8a0c89c087365fb50f3a9edd2cf64b2dda647c
2017-01-10 17:51:47 -08:00
Daniel Nishi
8cc6f9f718 Add click behavior to the storage item preferences.
This currently imitates the previous implementation behavior.
The new mocks have a new intermediate view for some of these
behaviors, but this view isn't ready yet.
This patch should bring parity for the click functionality
for the storage line item preferences.

Bug: 33199077
Test: Settings Robo Tests

Change-Id: I4f654d30add92e4eec721c36b2801f9af9824e78
2017-01-10 16:46:44 -08:00
TreeHugger Robot
c8cae26b21 Merge "Remove the app header from ManageApplications when used for storage." 2017-01-11 00:18:37 +00:00
TreeHugger Robot
366bb5b7d9 Merge "Update the Storage settings text." 2017-01-11 00:04:12 +00:00
TreeHugger Robot
c68d1bd380 Merge "Update DatabaseLoader querying." 2017-01-10 23:54:00 +00:00
TreeHugger Robot
c45311eb56 Merge "Show setting tiles for secondary users" 2017-01-10 22:51:30 +00:00
Matthew Fritze
7fda314980 Update DatabaseLoader querying.
Change the way the queries are built and sorted for the
database loader. It now constructs 3 queries that match
different columns. Each query returns their results
and gets sorted, then merged into the master list of
results.

Change-Id: Id643422ddfe26bfec89e04ee9f5832b99148e22a
Test: make RunSettingsRoboTests
Bug: 32904057, 32903623
2017-01-10 14:27:31 -08:00
TreeHugger Robot
99d56b7f1a Merge "Fix NPE in accountPrefController" 2017-01-10 22:17:41 +00:00
Daniel Nishi
bfd11313cb Update the Storage settings text.
The mocks used to say "Phone Storage" but that change in the
mocks was reverted.

Bug: 33199077
Test: None
Change-Id: I36bbb7d01a9598c92ec777905ae260fdc411b338
2017-01-10 13:59:57 -08:00
Daniel Nishi
b3d4de2ab7 Remove the app header from ManageApplications when used for storage.
This UI element is no longer in the mocks. It complicated the
implementation of the fragment because it was causing the wrong
apps to be selected on-tap.

This specific StorageUseActivity usage only happens when coming
from the Storage Settings UI, so we can freely remove it without
harming other uses of ManageApplications.

Bug: 34195303
Test: Manual -- it seemed a bit silly to add a test to ensure that
      a broken UI element was indeed missing.

Change-Id: I5396364c297026a33b54d1794d9ad2c5102f0d7f
2017-01-10 13:54:32 -08:00
Yanhong Shen
3489a40fd2 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060 am: a9e9bf20e8 am: 8b1f115942
am: 67ba7fc936

Change-Id: I69a8322ad0c4eaa56ab079c9b0cbaa314e83eb61
2017-01-10 21:38:51 +00:00
Yanhong Shen
67ba7fc936 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060 am: a9e9bf20e8
am: 8b1f115942

Change-Id: I67215050e9663e7bf84ec78c31d97e6b0291ae19
2017-01-10 21:33:49 +00:00
Yanhong Shen
8b1f115942 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060
am: a9e9bf20e8

Change-Id: Ia45623e60a3a774b3b21dd58d350f3c408aaff20
2017-01-10 21:28:47 +00:00
Daniel Nishi
c26b4bfbe4 Merge "Remove the LOGV guard from the categorization log statement." 2017-01-10 21:26:37 +00:00
Yanhong Shen
a9e9bf20e8 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
am: f952a87060

Change-Id: I0da164fbdbb04e54be2a26df85b8fcc1f58192e5
2017-01-10 21:24:19 +00:00
Salvador Martinez
e927d74c99 Merge "Custom layout for support info dialog" 2017-01-10 21:18:31 +00:00
Treehugger Robot
f952a87060 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" 2017-01-10 21:15:55 +00:00
TreeHugger Robot
fe75e6e58f Merge "Fix NPE when opening app detail page for work profile app" 2017-01-10 21:14:08 +00:00
Fan Zhang
9ec4536d8a Show setting tiles for secondary users
Change-Id: I912b3324753731a6633cf6fabfc26ae2e61963a0
Fix: 34176802
Test: runtest --path tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
2017-01-10 13:13:04 -08:00
Fan Zhang
424443bdb2 Fix NPE in accountPrefController
Change-Id: I83dba35604c501780fa9a99d122b9d9bc8068661
Fix: 34193417
Test: RunSettingsRoboTests
2017-01-10 11:50:42 -08:00
Geoffrey Pitsch
f032bf2df2 Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev am: 6688dae166
am: 5e36b66c91  -s ours

Change-Id: I2df1f21e9ef98683d49624ca8fe9890511872021
2017-01-10 19:18:13 +00:00
Geoffrey Pitsch
65b2ee4074 DO NOT MERGE Fix Notification Settings when unblockable app is blocked. am: db380fa9cb
am: 1eefc78280  -s ours

Change-Id: If9d0a59c98cd2502aa79537bd210ac7321b607aa
2017-01-10 19:17:56 +00:00
Geoffrey Pitsch
5e36b66c91 Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
am: 6688dae166

Change-Id: Ib8004c18bcc9db33c2340f89fc93268e41026c4d
2017-01-10 19:12:26 +00:00
Geoffrey Pitsch
1eefc78280 DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
am: db380fa9cb

Change-Id: I248be6a106a5dc20b5e391b2aebc267786a97e65
2017-01-10 19:12:25 +00:00
Geoffrey Pitsch
6688dae166 Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev 2017-01-10 19:06:01 +00:00
Fan Zhang
6fbdb5df55 Fix NPE when opening app detail page for work profile app
Change-Id: I7a4e5e427801c688d4d16dfe64785b12cc97f445
Fix: 34156709
Test: RunSettingsRoboTests
2017-01-10 09:53:48 -08:00
Fan Zhang
4185b2fef3 Merge "Create MeteredPreference with correct preference context." 2017-01-10 17:12:23 +00:00
Fan Zhang
a3af5a5c28 Merge "Set parent activity for search." 2017-01-10 17:11:41 +00:00
Yanhong Shen
ee9393582e Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off
When Wi-Fi is off, Advanced menus below should be disabled:
1. "Wi-Fi Direct"
2. "WPS Push Button"
3. "WPS Pin Entry"
in Settings->Wi-Fi->Advanced.

Bug:31102679
Test: Test with the device

Change-Id: I5af4c18512c991211eb42ef759e00917828f1b4c
2017-01-10 16:53:16 +09:00
Bill Yi
701d1b7b50 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: adce1145a9 -s ours
am: 7a490316e0  -s ours

Change-Id: I85f851533bb020a3403f8bcc550b7df6261cca66
2017-01-10 07:37:40 +00:00
Bill Yi
40a2a676ec Import translations. DO NOT MERGE am: 5d8d883ab1 -s ours
am: ff2cdd084a  -s ours

Change-Id: I2e50c1a292eb982524eaeb7b0aae61a63278116f
2017-01-10 07:37:23 +00:00
Bill Yi
7a490316e0 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: adce1145a9  -s ours

Change-Id: I7d6248afd47be986586f45a98b23a932d8457c2b
2017-01-10 07:27:47 +00:00
Bill Yi
ff2cdd084a Import translations. DO NOT MERGE
am: 5d8d883ab1  -s ours

Change-Id: I6227215a415906f4f6ba04e9d7edc0a587dafb3c
2017-01-10 07:27:45 +00:00
TreeHugger Robot
adce1145a9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-10 07:18:42 +00:00
TreeHugger Robot
9c18faaac5 Merge "Import translations. DO NOT MERGE" 2017-01-10 07:17:34 +00:00
TreeHugger Robot
3f5c3e3bc6 Merge "Remove debug log statement." 2017-01-10 02:25:19 +00:00
TreeHugger Robot
f349b07f96 Merge "Add metric event for skipping support disclaimer in future" 2017-01-10 02:03:08 +00:00
pkanwar
33abd37cbc DO NOT MERGE: Fix NPE in ConfigureWifiSettings. am: ef2b35ad59 -s ours
am: 63262f8975  -s ours

Change-Id: Ie7b9c2c39835c81965998bea6255317b0de3740a
2017-01-10 01:04:36 +00:00
Daniel Nishi
7f6d117c28 Remove debug log statement.
It accidentally was left in from a previous patch.

Test: None
Change-Id: I5f1638be7154b0870c19a8624be18e6aa433b4d8
2017-01-09 17:04:25 -08:00
Fan Zhang
da2d426d49 Create MeteredPreference with correct preference context.
Bug: 33775510
Test: visual
Change-Id: I201e685f70379e48053ee910113d5ce75fddc16e
2017-01-09 16:58:41 -08:00
pkanwar
63262f8975 DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
am: ef2b35ad59  -s ours

Change-Id: I512a3b568246c2693a335c63a22e88d6d4b3edbe
2017-01-10 00:58:24 +00:00
Fan Zhang
408c6a3e87 Set parent activity for search.
This enables the nav up button from actionbar.

Fix: 34176247
Test:  runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java

Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2
2017-01-09 16:39:25 -08:00
Salvador Martinez
9559d40896 Custom layout for support info dialog
The dialog showing users what is being support
needed a custom layout so the list items would line
up with the title of the alert dialog.

Test: Manual
Bug: 32462840
Change-Id: Ie3dc4d3e70946d25c1e4d65ab482aea4d00fa55a
2017-01-09 16:11:03 -08:00
Salvador Martinez
553ba00a27 Add metric event for skipping support disclaimer in future
We were not recording when users selected to skip the
support disclaimer in future requests for support. This
event has been added and logged when it occurs.

Test: SettingsRoboTests
Bug: 33414180
Change-Id: I689580ea2256d5554afcd17e77f90ae498d4ad1b
2017-01-09 15:59:41 -08:00
TreeHugger Robot
e5a7da2b16 Merge "Fix the animation issue in DashboardSummary" 2017-01-09 22:00:35 +00:00
Bill Yi
5d8d883ab1 Import translations. DO NOT MERGE
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
2017-01-09 13:14:43 -08:00
Bill Yi
e5c3cfb8ac Import translations. DO NOT MERGE
Change-Id: Ibd775a35c77810883e6366efbf9f0e4a0723b18a
Auto-generated-cl: translation import
2017-01-09 13:08:57 -08:00
jackqdyulei
0bb598c4d0 Fix the animation issue in DashboardSummary
1. When condition is inserted, only scroll to top when previous
position is at the top.

2. Clean condition status after it is removed. So the next time
you insert a condition view, it will always be collapsed.

Bug: 33839780
Bug: 34115341
Test: make -j40 RunSettingsRoboTests
Change-Id: I7f48524917c3119ec24b2f67ba506f381573a391
2017-01-09 12:30:57 -08:00