OSDN Git Service
Jeffrey Huang [Mon, 25 Sep 2017 22:31:22 +0000 (22:31 +0000)]
Merge "Introduce WifiDisplayCertPreferenceController"
Jeffrey Huang [Mon, 25 Sep 2017 21:24:21 +0000 (21:24 +0000)]
Merge "Introduce CameraLaserSensorPreferenceControllerV2"
jeffreyhuang [Mon, 25 Sep 2017 20:35:07 +0000 (13:35 -0700)]
Introduce WifiDisplayCertPreferenceController
- Create new WifiDisplayCertificationPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I34688131054e1a9d660482b04ad4b792235c445a
jeffreyhuang [Mon, 25 Sep 2017 17:19:51 +0000 (10:19 -0700)]
Introduce CameraLaserSensorPreferenceControllerV2
- Create new CameraLaserSensorPreferenceControllerV2
- Copy logic from CameraLaserSensorPreferenceController with slight
modifications for dashboard fragment compatibility
- Deprecate CameraLaserSensorPreferenceController
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8854d3e891afab607025a427a376e33e9b61dcc3
Jeffrey Huang [Mon, 25 Sep 2017 19:19:38 +0000 (19:19 +0000)]
Merge "Introduce DisableAutoUpdatesPreferenceController"
Adrian Roos [Mon, 25 Sep 2017 11:19:04 +0000 (11:19 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev am:
eafcc98ab8
am:
fce69dbb56
Change-Id: I43cef01451f2dead8a2a0a6abf745daa2f2090bb
Adrian Roos [Mon, 25 Sep 2017 11:17:22 +0000 (11:17 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
am:
eafcc98ab8
Change-Id: I3da818a64d47a397c2380cbd0ae36a714612d8f0
TreeHugger Robot [Mon, 25 Sep 2017 11:11:53 +0000 (11:11 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
Ng Zhi An [Sat, 23 Sep 2017 00:34:05 +0000 (00:34 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev am:
3de3cf85f4
am:
7c94fcc9bc
Change-Id: I44690e80e84d9de842d04bb349581cbfb2a3c808
Ng Zhi An [Sat, 23 Sep 2017 00:32:05 +0000 (00:32 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev
am:
3de3cf85f4
Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
TreeHugger Robot [Sat, 23 Sep 2017 00:28:27 +0000 (00:28 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev
Doris Ling [Fri, 22 Sep 2017 22:39:24 +0000 (22:39 +0000)]
Merge "Put code that updates the access points lists inside a Handler."
jeffreyhuang [Wed, 20 Sep 2017 22:34:25 +0000 (15:34 -0700)]
Introduce DisableAutoUpdatesPreferenceController
- Create new DisableAutomaticUpdatesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Iae7ff3f7d2e296968c67e14c33089b3b42c4912a
Winson Chung [Fri, 22 Sep 2017 21:45:46 +0000 (21:45 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev am:
625b1dd13a
am:
078d01c8c1 -s ours
Change-Id: I1e35d654d43011911b9fb92d15e78ccd04b6eb0b
Winson Chung [Fri, 22 Sep 2017 20:43:39 +0000 (20:43 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
am:
625b1dd13a
Change-Id: I5904804d9407a279de508fc8e071bc4132856545
Jeffrey Huang [Fri, 22 Sep 2017 20:38:40 +0000 (20:38 +0000)]
Merge "Introduce CoolColorTemperaturePreferenceController"
Winson Chung [Fri, 22 Sep 2017 20:30:28 +0000 (20:30 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 18:50:48 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Alison Cichowlas [Fri, 22 Sep 2017 18:44:07 +0000 (18:44 +0000)]
Notification importance/selected sound conflict fixes. am:
ad1158169c
am:
6c76550a73 -s ours
Change-Id: Iddd56dc48cdd6fbe7883aa29a17cba89000cd4c2
Alison Cichowlas [Fri, 22 Sep 2017 18:23:34 +0000 (18:23 +0000)]
Notification importance/selected sound conflict fixes.
am:
ad1158169c
Change-Id: I7b921e8845bcd549790318cc074838a24fe22182
Jeffrey Huang [Fri, 22 Sep 2017 17:02:44 +0000 (17:02 +0000)]
Merge "Introduce DebugViewAttributesPreferenceController"
Jeffrey Huang [Fri, 22 Sep 2017 17:01:41 +0000 (17:01 +0000)]
Merge "Introduce LocalTerminalPreferenceController"
TreeHugger Robot [Fri, 22 Sep 2017 16:55:08 +0000 (16:55 +0000)]
Merge "Let SuggestionFeatureProvider manage SuggestionService name"
Ng Zhi An [Thu, 21 Sep 2017 00:51:28 +0000 (17:51 -0700)]
Reflect device encryption status
On the Settings & Location settings page, the
encryption_and_credential preference will statically show
"Phone encrypted" regardless of encryption status of phone.
This change changes Settings to check for encryption status
of the phone and update the summary as required.
This requires adding a string saying that the device is not encrypted.
And translations will have to happen after this is merged.
Change-Id: I2f5bd281d8f1ed32801446fcdd453ebbaa04bd32
Bug:
65535239
Fixes:
65535239
Test: manual, I had a gobo phone that was not encrypted,
made sure that it said "Phone not encrypted", then tap through
to encrypt phone, and then check that it is now "Phone encrypted".
Alison Cichowlas [Thu, 14 Sep 2017 19:01:29 +0000 (15:01 -0400)]
Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.
Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes:
63109928
Test: RunSettingsRoboTests, manual
Alison Cichowlas [Fri, 22 Sep 2017 12:47:49 +0000 (12:47 +0000)]
Merge "Notification importance/selected sound conflict fixes."
Adrian Roos [Fri, 22 Sep 2017 11:28:54 +0000 (13:28 +0200)]
FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes:
65408626
Test: manual
Ng Zhi An [Fri, 22 Sep 2017 06:37:24 +0000 (06:37 +0000)]
Fix icon for sim card in settings am:
097f4184fa
am:
a81e3e3c8e
Change-Id: I955a71c8cf520f4e90f71271eb0245bf329f13a1
Ng Zhi An [Fri, 22 Sep 2017 06:35:24 +0000 (06:35 +0000)]
Fix icon for sim card in settings
am:
097f4184fa
Change-Id: Ifdd84f460091d4d9e3310e70c31199c29320ecd6
Fan Zhang [Fri, 22 Sep 2017 01:21:44 +0000 (18:21 -0700)]
Let SuggestionFeatureProvider manage SuggestionService name
Bug:
65065268
Test: robotests
Change-Id: I82315a7b1565dc34b516bf685ad8e831a1e28591
jeffreyhuang [Fri, 22 Sep 2017 00:02:29 +0000 (17:02 -0700)]
Introduce DebugViewAttributesPreferenceController
- Create new DebugViewAttributesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ida84c187f2670a601aaf1ff2f141807b28ec081c
jeffreyhuang [Thu, 21 Sep 2017 22:37:14 +0000 (15:37 -0700)]
Introduce LocalTerminalPreferenceController
- Create new LocalTerminalPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib4a375181af9367a4aef74fd9889de2de1c8652d
TreeHugger Robot [Thu, 21 Sep 2017 23:08:48 +0000 (23:08 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles."
Ng Zhi An [Wed, 20 Sep 2017 22:17:29 +0000 (15:17 -0700)]
Fix icon for sim card in settings
Change-Id: I1e235cad1712343e2990eab114fd2ef383aac77f
Bug:
65574460
Fixes:
65574460
Test: manually build and install Settings apk and open app to check
Alison Cichowlas [Thu, 14 Sep 2017 19:01:29 +0000 (15:01 -0400)]
Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.
Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes:
63109928
Test: RunSettingsRoboTests, manual
Jeffrey Huang [Thu, 21 Sep 2017 21:07:29 +0000 (21:07 +0000)]
Merge "Introduce PictureColorModePreferenceController"
TreeHugger Robot [Thu, 21 Sep 2017 20:18:06 +0000 (20:18 +0000)]
Merge "Fix pattern header string usage"
Doris Ling [Thu, 21 Sep 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0 am:
296c46404c am:
c13415391b
am:
913d1667ce
Change-Id: Ib859bec6cd9ca1422856d091fc7a0b9894397b04
Doris Ling [Thu, 21 Sep 2017 19:29:53 +0000 (19:29 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0 am:
296c46404c
am:
c13415391b
Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579
Doris Ling [Thu, 21 Sep 2017 19:27:20 +0000 (19:27 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0
am:
296c46404c
Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
Doris Ling [Thu, 21 Sep 2017 19:24:52 +0000 (19:24 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
am:
cd959f28a0
Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
jeffreyhuang [Mon, 18 Sep 2017 21:45:49 +0000 (14:45 -0700)]
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
Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
Maurice Lam [Thu, 21 Sep 2017 18:33:55 +0000 (11:33 -0700)]
Fix pattern header string usage
Test: Builds with ag/
2933970 cherry-picked on top
Bug:
66446463
Change-Id: I0c649427474cd9b1cf388f45407deea582d01c9a
Bill Yi [Thu, 21 Sep 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
17acd3d1c8 -s ours
am:
d516ba6a80 -s ours
Change-Id: I97a4c786fb415114d96035896128e874402676a1
Bill Yi [Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
17acd3d1c8 -s ours
Change-Id: I1813ac496b209342c8326a8107b2597691f16da1
TreeHugger Robot [Thu, 21 Sep 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Winson Chung [Fri, 15 Sep 2017 21:48:46 +0000 (14:48 -0700)]
Fixing issue with PiP settings not showing apps for other profiles.
Bug:
65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: If3562dc7c2ddf07e2fc19591238dc3a7b4e9dba7
Merged-In: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
Winson Chung [Fri, 15 Sep 2017 21:48:46 +0000 (14:48 -0700)]
Fixing issue with PiP settings not showing apps for other profiles.
Bug:
65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
Julia Reynolds [Thu, 21 Sep 2017 11:39:22 +0000 (11:39 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev am:
a639e32289
am:
b0f3f6ce05
Change-Id: I188274147f7a4a5963e385a98adcef47e45d7069
Julia Reynolds [Thu, 21 Sep 2017 11:36:50 +0000 (11:36 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
am:
a639e32289
Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501
Julia Reynolds [Thu, 21 Sep 2017 11:33:09 +0000 (11:33 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
tiansiming [Tue, 19 Sep 2017 10:16:19 +0000 (18:16 +0800)]
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>
Jack He [Thu, 21 Sep 2017 05:07:36 +0000 (05:07 +0000)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater am:
ac040e3b1f
am:
1197438540
Change-Id: I1ee2b808431c7eb324bc30e43c34f5e4799281f2
Fan Zhang [Thu, 21 Sep 2017 05:06:57 +0000 (05:06 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev am:
b9da1117d0
am:
a404be0032 -s ours
Change-Id: If4c88526ec4c0dac39ba53974494720ec14c9d97
Bill Yi [Thu, 21 Sep 2017 01:33:03 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec
Bill Yi [Thu, 21 Sep 2017 01:21:02 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaff8bc5d7a9feb9e1cd9e8054ca588a45431a75c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
jeffreyhuang [Mon, 18 Sep 2017 22:24:01 +0000 (15:24 -0700)]
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: I9aca46ef0949b71437f8d181c501b8099d77774c
Jeffrey Huang [Thu, 21 Sep 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Revert "Introduce CoolColorTemperaturePreferenceController""
Jeffrey Huang [Thu, 21 Sep 2017 00:33:40 +0000 (00:33 +0000)]
Revert "Introduce CoolColorTemperaturePreferenceController"
This reverts commit
ebcf01f128422e82bf6bcd29dab8836efb94430f.
Change-Id: Ie26f1790833741e56012dda95702f087d867c552
Jeffrey Huang [Thu, 21 Sep 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Introduce CoolColorTemperaturePreferenceController"
TreeHugger Robot [Wed, 20 Sep 2017 23:29:51 +0000 (23:29 +0000)]
Merge "Add isAvailable check to devOptionsController"
Doris Ling [Wed, 20 Sep 2017 21:40:40 +0000 (14:40 -0700)]
Put code that updates the access points lists inside a Handler.
When access point is forgot, we got callbacks from WifiManager to tell
us if the forget action is successful or not. We will refresh the access
point list in both cases. However, these callbacks happens on a
different thread and updating preferences should only be done on the
main thread. Creating a handler to handler all updates in the main
thread.
Change-Id: I7593befb20e46391ad69a284375693351a2cc794
Fixes:
65745404
Test: make RunSettingsRoboTests
jeffreyhuang [Mon, 18 Sep 2017 22:24:01 +0000 (15:24 -0700)]
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
Jack He [Wed, 20 Sep 2017 21:43:24 +0000 (21:43 +0000)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
am:
ac040e3b1f
Change-Id: I13a2bd7e40a94773fc0afe37d71d7ba60e2b625b
jeffreyhuang [Tue, 19 Sep 2017 17:44:30 +0000 (10:44 -0700)]
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
TreeHugger Robot [Wed, 20 Sep 2017 20:32:37 +0000 (20:32 +0000)]
Merge "Add since_visible_millis to Settings action logs."
Jeffrey Huang [Wed, 20 Sep 2017 20:26:57 +0000 (20:26 +0000)]
Merge changes from topic "OemUnlockPreference"
* changes:
Add comments to avoid merge conflicts
Introduce OemUnlockPreferenceController
Jack He [Tue, 12 Sep 2017 23:26:06 +0000 (16:26 -0700)]
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
Eric Schwarzenbach [Thu, 14 Sep 2017 18:09:21 +0000 (11:09 -0700)]
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
TreeHugger Robot [Wed, 20 Sep 2017 17:57:45 +0000 (17:57 +0000)]
Merge "Fix NPE when calling getSuggestionV2 in adapter."
Fan Zhang [Wed, 20 Sep 2017 16:33:48 +0000 (16:33 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
am:
b9da1117d0
Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
Fan Zhang [Wed, 20 Sep 2017 16:01:38 +0000 (09:01 -0700)]
Fix NPE when calling getSuggestionV2 in adapter.
Change-Id: I3aa498c2255107ca2e33046f3df629c2ef43ec5c
Fixes:
66111737
Test: robotest
TreeHugger Robot [Wed, 20 Sep 2017 16:17:28 +0000 (16:17 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
Julia Reynolds [Wed, 20 Sep 2017 14:00:03 +0000 (10:00 -0400)]
Sometimes there's no advanced settings
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes:
65964886
Christine Franks [Wed, 20 Sep 2017 01:23:44 +0000 (18:23 -0700)]
resolve merge conflicts of
92f7794d90 to master
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
Christine Franks [Wed, 20 Sep 2017 00:43:25 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
cb52e803bf
Change-Id: I16968b7e1572cb91afc2345a16437194b243a955
Christine Franks [Wed, 20 Sep 2017 00:23:29 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 23:36:38 +0000 (23:36 +0000)]
Merge "Load suggestions through SettingsIntelligence."
Doris Ling [Tue, 19 Sep 2017 22:51:04 +0000 (22:51 +0000)]
Merge "Add log to help debug crash."
Ajay Nadathur [Tue, 19 Sep 2017 22:36:09 +0000 (22:36 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am:
dc66f96dda
am:
b4b657179f
Change-Id: I86c4f0b77dd9be9926e92dd5c2cd57cce5c3e3d4
Ajay Nadathur [Tue, 19 Sep 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
dc66f96dda
Change-Id: I7ca36b1a5712b2ed3ec890bab376b9cc63dd1c8b
TreeHugger Robot [Tue, 19 Sep 2017 22:13:30 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Sundeep Ghuman [Tue, 19 Sep 2017 21:22:08 +0000 (21:22 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am:
77aeb2a0a7
am:
ea98db9946
Change-Id: I5b125c60c4cc39b8f8661b2eff6d19de0c1c5eff
Sundeep Ghuman [Tue, 19 Sep 2017 21:14:05 +0000 (21:14 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
am:
77aeb2a0a7
Change-Id: I86e514f4a8d9546e4d2e60bc7967ba8bdf4e0a8c
TreeHugger Robot [Tue, 19 Sep 2017 20:56:34 +0000 (20:56 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
Doris Ling [Tue, 19 Sep 2017 20:50:31 +0000 (13:50 -0700)]
Add log to help debug crash.
Bug:
65745404
Test: make RunSettingsRoboTests
Change-Id: Ia0d1de57ed33a08a54294e4b9895464e219cbc90
jeffreyhuang [Mon, 18 Sep 2017 21:29:24 +0000 (14:29 -0700)]
Add comments to avoid merge conflicts
- These comments will be changed to controllers.add(...)
- avoid merge conflicts when adding controller
buildPreferenceControllers()
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I43f6b9ac41291f67626ba5d6f3ab3917c9c5e784
jeffreyhuang [Fri, 15 Sep 2017 23:01:34 +0000 (16:01 -0700)]
Introduce OemUnlockPreferenceController
- Create new OemUnlockPreferenceController
- Add new onActivityResult method in DeveloperOptionsController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I0b1387b9547e7c9f2a1a0963421d0ebea55d9ff4
Fan Zhang [Thu, 17 Aug 2017 23:13:20 +0000 (16:13 -0700)]
Load suggestions through SettingsIntelligence.
- Add flag to switch between old/new implementation
- Add SuggestionLoader to load using Loader (instead of AsyncTask)
- Update DashboardAdapater/SuggestionAdapter to take List<Suggestion>
- Marked old getter/setters as @Deprecated and added comment
- Update tests to cover suggestionV2 adapter changes.
TODO:
- Handler for dismissing suggestion not set up yet.
- Suggestion data structure is incomplete (missing icon, remote view, etc)
- Need to extend Suggestion data strcture to support icon and
remote view binding
Bug:
65065268
Test: robotests
Change-Id: I2378ef4c9edee972d5de93c3868068e2cde23f56
Ajay Nadathur [Fri, 15 Sep 2017 00:33:28 +0000 (17:33 -0700)]
Deferred setup banner updates intermittently
bug:
65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
Salvador Martinez [Tue, 19 Sep 2017 18:11:11 +0000 (18:11 +0000)]
Merge "remove old anomaly code"
Christine Franks [Fri, 25 Aug 2017 21:02:42 +0000 (14:02 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: make RunSettingsRoboTests -j100
Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
TreeHugger Robot [Tue, 19 Sep 2017 17:52:37 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Mon, 18 Sep 2017 23:16:57 +0000 (16:16 -0700)]
Turn off WifiTetherSettings page.
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes:
65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
TreeHugger Robot [Tue, 19 Sep 2017 03:57:59 +0000 (03:57 +0000)]
Merge "Update strings for pattern screens"
Lei Yu [Tue, 19 Sep 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Enable the color lint check"
Bill Yi [Tue, 19 Sep 2017 01:06:54 +0000 (01:06 +0000)]
Import translations. DO NOT MERGE am:
0a0d3d1b86 -s ours
am:
f874590924 -s ours
Change-Id: I87d6e097e4cb4736c6a6de23a871da6e8d726284
Bill Yi [Tue, 19 Sep 2017 01:02:54 +0000 (01:02 +0000)]
Import translations. DO NOT MERGE
am:
0a0d3d1b86 -s ours
Change-Id: I65871b7da2ee00f40b81803400ed9e28bf6e9479
jackqdyulei [Mon, 18 Sep 2017 23:32:59 +0000 (16:32 -0700)]
Enable the color lint check
We disabled color check because the error message was
ambiguous when the android environment hadn't been set
up.
Since the error mesage has been updated, we can turn it
back on.
Bug:
65850237
Test: repo upload .
Change-Id: I9517192b8b7d8131014e3ac44e3edb2d97134bb6
OSDN Git Service
