Maurice Lam
e18902ec67
Update Robolectric to 3.4.2
...
Bug: 66693279
Test: m RunSettingsRoboTests
m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
2017-09-22 18:34:00 +00:00
TreeHugger Robot
d0b1297e84
Merge "Fixing issue with PiP settings not showing apps for other profiles."
2017-09-21 23:08:48 +00:00
Jeffrey Huang
b9a1f1a563
Merge "Introduce PictureColorModePreferenceController"
2017-09-21 21:07:29 +00:00
TreeHugger Robot
ab74ca143a
Merge "Fix pattern header string usage"
2017-09-21 20:18:06 +00:00
Doris Ling
744ff5c607
Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c am: c13415391b
...
am: 913d1667ce
2017-09-21 19:31:54 +00:00
Doris Ling
913d1667ce
Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c
...
am: c13415391b
2017-09-21 19:29:53 +00:00
Doris Ling
c13415391b
Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0
...
am: 296c46404c
2017-09-21 19:27:20 +00:00
Doris Ling
296c46404c
Merge "Fix NPE crash in UsageAccessDetails"
...
am: cd959f28a0
2017-09-21 19:24:52 +00:00
jeffreyhuang
6162fa5ef8
Introduce PictureColorModePreferenceController
...
- Create new PictureColorModePreferenceController
- Create controller inside the DashboardFragment
- Refactor ColorModePreference so isAvailable() no longer depends on
ColorModePreference
- Port logic from DevelopmentSettings into the controller
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8dff5b0d5ad1d7f043fc7ead540b2c0c960933e3
2017-09-21 12:24:32 -07:00
Doris Ling
cd959f28a0
Merge "Fix NPE crash in UsageAccessDetails"
2017-09-21 19:21:03 +00:00
Maurice Lam
1fb3ce01d0
Fix pattern header string usage
...
Test: Builds with ag/2933970 cherry-picked on top
Bug: 66446463
Change-Id: I0c649427474cd9b1cf388f45407deea582d01c9a
2017-09-21 18:41:14 +00:00
Bill Yi
5733267b15
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 17acd3d1c8 -s ours
...
am: d516ba6a80
2017-09-21 17:57:41 +00:00
Bill Yi
d516ba6a80
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 17acd3d1c8
2017-09-21 17:53:43 +00:00
TreeHugger Robot
17acd3d1c8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-21 17:48:00 +00:00
Winson Chung
3baa08b44f
Fixing issue with PiP settings not showing apps for other profiles.
...
Bug: 65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
2017-09-21 09:26:39 -07:00
Julia Reynolds
a0482aa58a
Merge "Sometimes there's no advanced settings" into oc-mr1-dev am: a639e32289
...
am: b0f3f6ce05
2017-09-21 11:39:22 +00:00
Julia Reynolds
b0f3f6ce05
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
...
am: a639e32289
2017-09-21 11:36:50 +00:00
Julia Reynolds
a639e32289
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
2017-09-21 11:33:09 +00:00
tiansiming
39de7aedee
Fix NPE crash in UsageAccessDetails
...
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java
Bug:https://issuetracker.google.com/issues/65872768
Test:As explained in the link above
Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-09-21 14:12:50 +08:00
Jack He
d8684d44f1
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater am: ac040e3b1f
...
am: 1197438540
2017-09-21 05:07:36 +00:00
Fan Zhang
751a8c24fb
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev am: b9da1117d0
...
am: a404be0032
2017-09-21 05:06:57 +00:00
Bill Yi
e781dfa10c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec
2017-09-20 18:33:03 -07:00
Jeffrey Huang
31b04f526f
Merge "Revert "Introduce CoolColorTemperaturePreferenceController""
2017-09-21 00:54:18 +00:00
Jeffrey Huang
8c57f28c7a
Revert "Introduce CoolColorTemperaturePreferenceController"
...
This reverts commit ebcf01f128
2017-09-21 00:33:40 +00:00
Jeffrey Huang
6b9f2e1414
Merge "Introduce CoolColorTemperaturePreferenceController"
2017-09-21 00:01:51 +00:00
TreeHugger Robot
2fe10447c6
Merge "Add isAvailable check to devOptionsController"
2017-09-20 23:29:51 +00:00
jeffreyhuang
ebcf01f128
Introduce CoolColorTemperaturePreferenceController
...
- Create new CoolColorTemperaturePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib138dd55f197ae4cc14db4f3414abdd644e6b202
2017-09-20 14:48:09 -07:00
Jack He
1197438540
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
...
am: ac040e3b1f
2017-09-20 21:43:24 +00:00
jeffreyhuang
f5539a1969
Add isAvailable check to devOptionsController
...
- This avoids the null check for PreferenceControllers where isAvailable()
is not always true
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibed8bc6a2a812355c521620d77fb571c1fd8a649
2017-09-20 13:44:16 -07:00
TreeHugger Robot
41df9518ab
Merge "Add since_visible_millis to Settings action logs."
2017-09-20 20:32:37 +00:00
Jeffrey Huang
ff3971038e
Merge changes from topic "OemUnlockPreference"
...
* changes:
Add comments to avoid merge conflicts
Introduce OemUnlockPreferenceController
2017-09-20 20:26:57 +00:00
Jack He
ac040e3b1f
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
...
* LocalBluetoothAdapter is already a cache of BluetoothAdapter and its
methods should be used directly to obtain states instead of caching them
in BluetoothSummaryUpdater
- Use LocalBluetoothAdapter.isEnabled() to check whether Bluetooth
is enabled
- Use LocalBluetoothAdapter.getBondedDevices() to get list of bonded
devices
* BluetoothDevice is a stable Bluetooth API and its methods should not
incur large latency. We should use API methods as much as possible to
avoid intermediate wrappers
- Use BluetoothDevice.isConnected() to check if a device is connected
* Add more logging messages in error conditions
* Show status as "Not Connected" when there is a state mismatch (i.e.
adapter says it is connected, but no bonded device is connected)
* Updated unit tests to reflect the latest behavior
Bug: 65591907
Test: make, unit test, pair with Bluetooth devices, check Settings UI
Change-Id: I0fa54959c8bed8ac67a935f150785ba8197d0411
2017-09-20 11:35:19 -07:00
Eric Schwarzenbach
79f3476021
Add since_visible_millis to Settings action logs.
...
This change adds a new action logging method on MetricsFeatureProvider
within Settings.
Uses the VisibilityLoggerMixin to calculate the elapsed time since
the fragment has been visible. Adds tagged data in
MetricsFeatureProvider#action() to store this elapsed time in
NOTIFICATION_SINCE_VISIBLE_MILLIS in MetricsEvents. Modifies the
LogWriter interface to accept variadic taggedData args in its action()
methods. Annotates the old subtype #action() methods as deprecated.
EventLogWriter also no longer casts the subtype values to strings before
sending them to MetricsLogger, so they are correctly stored as subtype
instead of package.
Bug: 65371699, 65631695
Test: make RunSettingsRoboTests
Change-Id: Iec6a61dd6a49ab237e2bdc4469fed45e89d9c380
2017-09-20 11:26:35 -07:00
TreeHugger Robot
10ba1f1ee7
Merge "Fix NPE when calling getSuggestionV2 in adapter."
2017-09-20 17:57:45 +00:00
Fan Zhang
a404be0032
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
...
am: b9da1117d0
2017-09-20 16:33:48 +00:00
Fan Zhang
45424c5464
Fix NPE when calling getSuggestionV2 in adapter.
...
Change-Id: I3aa498c2255107ca2e33046f3df629c2ef43ec5c
Fixes: 66111737
Test: robotest
2017-09-20 09:19:17 -07:00
TreeHugger Robot
b9da1117d0
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
2017-09-20 16:17:28 +00:00
Julia Reynolds
a25e54fdf6
Sometimes there's no advanced settings
...
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes: 65964886
2017-09-20 10:00:03 -04:00
Christine Franks
bfb671391d
resolve merge conflicts of 92f7794d90 to master
...
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
2017-09-19 18:24:33 -07:00
Christine Franks
92f7794d90
Merge "Handle night display state when timezone changes" into oc-mr1-dev
...
am: cb52e803bf
2017-09-20 00:43:25 +00:00
Christine Franks
cb52e803bf
Merge "Handle night display state when timezone changes" into oc-mr1-dev
2017-09-20 00:23:29 +00:00
TreeHugger Robot
530de5be78
Merge "Load suggestions through SettingsIntelligence."
2017-09-19 23:36:38 +00:00
Doris Ling
f2b60f9c17
Merge "Add log to help debug crash."
2017-09-19 22:51:04 +00:00
Ajay Nadathur
eedc449654
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am: dc66f96dda
...
am: b4b657179f
2017-09-19 22:36:09 +00:00
Ajay Nadathur
b4b657179f
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
...
am: dc66f96dda
2017-09-19 22:26:18 +00:00
TreeHugger Robot
dc66f96dda
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
2017-09-19 22:13:30 +00:00
Sundeep Ghuman
00685675c8
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am: 77aeb2a0a7
...
am: ea98db9946
2017-09-19 21:22:08 +00:00
Sundeep Ghuman
ea98db9946
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
...
am: 77aeb2a0a7
2017-09-19 21:14:05 +00:00
TreeHugger Robot
77aeb2a0a7
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
2017-09-19 20:56:34 +00:00
Doris Ling
3afe3b0cbf
Add log to help debug crash.
...
Bug: 65745404
Test: make RunSettingsRoboTests
Change-Id: Ia0d1de57ed33a08a54294e4b9895464e219cbc90
2017-09-19 13:50:31 -07:00
