Commit Graph

32808 Commits

Author SHA1 Message Date
Daniel Nishi
a0f1e5adb9 Merge "Update the storage summary header." 2017-01-11 22:42:21 +00:00
TreeHugger Robot
382550a12d Merge changes Idf05ffee,Ie7371ba4
* changes:
  Update "More" button text to "Advanced"
  Fix NPE when adding account but prefManager doesn't exist
2017-01-11 22:02:32 +00:00
Daniel Nishi
b465005c29 Update the storage summary header.
This changes it to now have a donut graph and reflects the new UI.
Finalized redlines are still pending, so there will be a follow
up patch to get everything aligned as per the mocks.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: Ic12a77bd9be335af14f80886d1ecc24c82940e9b
2017-01-11 12:37:33 -08:00
Fan Zhang
4b3057809d Update "More" button text to "Advanced"
Test: visual
Change-Id: Idf05ffee206318b8bb10fb7547bcb68ad882b474
2017-01-11 12:30:37 -08:00
Salvador Martinez
75ed4986c1 Added feature for surveys provider to Settings am: cd0fe608c5
am: 40c7468673  -s ours

Change-Id: Ia9bc949aca53111743a88ae8f6f11511107632d8
2017-01-11 20:23:59 +00:00
Salvador Martinez
40c7468673 Added feature for surveys provider to Settings
am: cd0fe608c5

Change-Id: I13ceb5009800cb25483d85220c0ec22051f79cbe
2017-01-11 19:41:26 +00:00
Daniel Nishi
033dc469e5 Merge "Hook up the storage item preferences to actual data." 2017-01-11 19:14:32 +00:00
Fan Zhang
81a030fdfa Fix NPE when adding account but prefManager doesn't exist
Change-Id: Ie7371ba461995bae96ed1d99e224ab7e0d7acc99
Fix: 34219500
Test: make -j40 RunSettingsRoboTests
2017-01-11 10:46:45 -08:00
Salvador Martinez
cd0fe608c5 Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.

Test: In Master Branch
Bug: 27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
2017-01-11 09:51:31 -08:00
Pavlin Radoslavov
8116060570 Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06 am: 6e154cfb98 am: 216dcdc9dc
am: 0cc9fd4b82

Change-Id: I0da9a9c515e6ae23b5449d4b53b6268ce5beaece
2017-01-11 06:34:10 +00:00
Pavlin Radoslavov
0cc9fd4b82 Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06 am: 6e154cfb98
am: 216dcdc9dc

Change-Id: I53981066dfc5975aa4bd02b2d5004d286bb7dc63
2017-01-11 06:27:09 +00:00
Pavlin Radoslavov
216dcdc9dc Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06
am: 6e154cfb98

Change-Id: I985957eb0322dc13571705f9cc8d5abe65a931bb
2017-01-11 06:21:10 +00:00
Pavlin Radoslavov
6e154cfb98 Merge "Moved the Bluetooth-related default config init within onCreate()"
am: ab9e269d06

Change-Id: Ic0d0d4b6d63b25afafae35b81686e746939646fd
2017-01-11 06:15:39 +00:00
Treehugger Robot
ab9e269d06 Merge "Moved the Bluetooth-related default config init within onCreate()" 2017-01-11 06:07:40 +00:00
TreeHugger Robot
c3b80d6a00 Merge "Refactor ConfigureWifiSettings for better testing" 2017-01-11 03:17:09 +00:00
Daniel Nishi
884809199f Hook up the storage item preferences to actual data.
This uses the same storage query implementation as the previous
iteration of the Storage Settings. In b/32206268, a new API for
querying this information will be added for querying this info.

Once the new API has landed, a future patch will swap out the
impl, but this should work for today.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: I58763e8ee38aabbea533bc614268288e854ff8d4
2017-01-10 17:52:52 -08: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
Pavlin Radoslavov
0a63e8b768 Moved the Bluetooth-related default config init within onCreate()
This should avoid potential crashes in case somehow onCreateView() is
called without onCreate() being called first.

Test: Manual UI interaction with Developer Settings
Bug: 34192829
Change-Id: Iaf46d05f30d20f98727c4dbfb91feef8509c92f7
2017-01-10 23:52:06 +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