OSDN Git Service
Jeffrey Huang [Wed, 27 Sep 2017 17:08:40 +0000 (17:08 +0000)]
Merge "Fix a bug in CameraHalHdrPlusPrefCtrlV2Test"
Jeffrey Huang [Wed, 27 Sep 2017 17:08:19 +0000 (17:08 +0000)]
Merge "Introduce WifiVerboseLoggingPreferenceCtrl"
Jeffrey Huang [Wed, 27 Sep 2017 17:03:09 +0000 (17:03 +0000)]
Merge changes from topic "DevOptionsDebugger"
* changes:
Introduce WaitForDebuggerPreferenceController
Introduce SelectDebugAppPreferenceController
Bill Yi [Wed, 27 Sep 2017 02:58:41 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
56555e0403 -s ours
am:
bcac4b4c7b -s ours
Change-Id: I6ae1eb784a96a9147489a3bdccb6430e1079f4a7
TreeHugger Robot [Wed, 27 Sep 2017 02:56:17 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Kevin Chyn [Wed, 27 Sep 2017 02:56:01 +0000 (02:56 +0000)]
Merge "Move fingerprint authentication to a sidecar"
Bill Yi [Wed, 27 Sep 2017 02:55:05 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
56555e0403 -s ours
Change-Id: Ic83e7a755169fb3a2336c2f8d9489c22619ba46c
TreeHugger Robot [Wed, 27 Sep 2017 02:50:26 +0000 (02:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Kevin Chyn [Wed, 27 Sep 2017 00:55:43 +0000 (00:55 +0000)]
Merge "Update Fingerprint/PIN string to fix grammar"
Lei Yang [Tue, 26 Sep 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am:
d2f42970bf am:
a40f7c0f5e am:
17b5110539
am:
255b8a219a
Change-Id: I5bd94646d59a913d020979343ff047ae698428e6
TreeHugger Robot [Tue, 26 Sep 2017 23:46:21 +0000 (23:46 +0000)]
Merge "Plumb SuggestionControllerMixin to DismissController."
Lei Yang [Tue, 26 Sep 2017 23:43:48 +0000 (23:43 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am:
d2f42970bf am:
a40f7c0f5e
am:
17b5110539
Change-Id: I5d6198eca00d835e46d90c28e51251fbfd0cbd57
jeffreyhuang [Tue, 26 Sep 2017 23:34:50 +0000 (16:34 -0700)]
Fix a bug in CameraHalHdrPlusPrefCtrlV2Test
- Fix a bug where an incorrect config value was being passed
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ic42d94867097f7944e66ecc3abc42bb8b72608a2
Lei Yang [Tue, 26 Sep 2017 23:39:35 +0000 (23:39 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am:
d2f42970bf
am:
a40f7c0f5e
Change-Id: Id39f30a8d87b5798f12c7e4129351f8735e61c6d
Bill Yi [Tue, 26 Sep 2017 23:36:49 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I55b6e616f1dd402c1c0cb7d17f593d4b7d904d85
Lei Yang [Tue, 26 Sep 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
am:
d2f42970bf
Change-Id: Iecac3e7e8a04356f377a2d8886bb86f70c0ab96e
Bill Yi [Tue, 26 Sep 2017 23:23:23 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id06041d19aa6a55c7ad70831980117dfcab12d3a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Treehugger Robot [Tue, 26 Sep 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
Kevin Chyn [Tue, 26 Sep 2017 19:54:08 +0000 (12:54 -0700)]
Move fingerprint authentication to a sidecar
It's possible for this sequence of events to occur
1) touch FPS
2) rotate device
3) authentication succeed message goes to pre-rotated activity
The pre-rotated activity will continue authenticating, and the fragment
will not highlight correctly upon authentication
Fixes:
63907591
Test: manual test of above condition, looks to be fixed
Test: rapidly tapping FPS while rotating works as expected
Change-Id: Ic830016f8bf52f926681110fcd908619ffc9dd31
jeffreyhuang [Fri, 22 Sep 2017 21:36:38 +0000 (14:36 -0700)]
Introduce WaitForDebuggerPreferenceController
- Create new WaitForDebuggerPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I95e25ad244328dd49da1b1e8fcd1c264f0ccc587
jeffreyhuang [Fri, 22 Sep 2017 20:28:29 +0000 (13:28 -0700)]
Introduce SelectDebugAppPreferenceController
- Create new SelectDebugAppPreferenceController
- Update onActivityResult to loop through all controllers
- Add new activity request code
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I90b1da2d536389e45d717adffb3b190ec13b9a2a
jeffreyhuang [Mon, 25 Sep 2017 22:04:12 +0000 (15:04 -0700)]
Introduce WifiVerboseLoggingPreferenceCtrl
- Create new WifiVerboseLoggingPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Iccfc9840ed8f5cf4417e326b1bdc62800cb4e93e
Jeffrey Huang [Tue, 26 Sep 2017 21:52:00 +0000 (21:52 +0000)]
Merge "Introduce BluetoothDeviceNoNamePreferenceCtrl"
Jeffrey Huang [Tue, 26 Sep 2017 21:51:42 +0000 (21:51 +0000)]
Merge "Introduce MobileDataAlwaysOnPreferenceController"
Jeffrey Huang [Tue, 26 Sep 2017 21:51:30 +0000 (21:51 +0000)]
Merge "Introduce WifiAggressiveHandoverPreferenceCtrl"
Jeffrey Huang [Tue, 26 Sep 2017 21:51:01 +0000 (21:51 +0000)]
Merge "Introduce CameraHalHdrPlusPreferenceControllerV2"
Fan Zhang [Mon, 25 Sep 2017 23:44:28 +0000 (16:44 -0700)]
Plumb SuggestionControllerMixin to DismissController.
- The SuggestionControllerMixin is needed to dismiss a suggestion.
- When swipe a suggestion, SuggestionControllerMixin is called, which
then calls API in SuggestionService to dismiss a suggestion.
Bug:
65065268
Test: robotests
Change-Id: I6a0c5823d60b995ab4a36b1c91777f5cd31a500d
jeffreyhuang [Tue, 26 Sep 2017 18:41:53 +0000 (11:41 -0700)]
Introduce MobileDataAlwaysOnPreferenceController
- Create new MobileDataAlwaysOnPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DeveloperSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: If4b1a0d14c4b24cb1562a37627436bfb011e9310
jeffreyhuang [Tue, 26 Sep 2017 00:18:14 +0000 (17:18 -0700)]
Introduce BluetoothDeviceNoNamePreferenceCtrl
- Create new BluetoothDeviceNoNamePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ia73952bd396fb50d96393befd011f7cdc08689f7
jeffreyhuang [Mon, 25 Sep 2017 20:53:34 +0000 (13:53 -0700)]
Introduce WifiAggressiveHandoverPreferenceCtrl
- Create new WifiAggressiveHandoverPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ic32119a83ca21a6475cfd27b04cde76ba87bd372
TreeHugger Robot [Tue, 26 Sep 2017 17:14:34 +0000 (17:14 +0000)]
Merge "Rename TelephonyMonitor to ConnectivityMonitor"
jeffreyhuang [Mon, 25 Sep 2017 19:28:02 +0000 (12:28 -0700)]
Introduce CameraHalHdrPlusPreferenceControllerV2
- Create new CameraHalHdrPlusPreferenceControllerV2
- Copy logic from CameraHalHdrPlusPreferenceController with slight
modifications for dashboard fragment compatibility
- Deprecate CameraHalHdrPlusPreferenceController
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I9b88286d16930df208c7c413728c816637409c81
Jeffrey Huang [Tue, 26 Sep 2017 16:56:57 +0000 (16:56 +0000)]
Merge "Introduce WifiRoamScansPreferenceController"
Naveen Kalla [Wed, 20 Sep 2017 01:36:03 +0000 (18:36 -0700)]
Rename TelephonyMonitor to ConnectivityMonitor
TelephonyMonitor can be extended to catch WIFI and GPS
issues.
Bug:
38422753
Test: Unit tests and manual testing
Change-Id: I71f9cf75fdc792452dd35a3581ef0f5fcc0c1ab0
Lei Yang [Mon, 13 Feb 2017 02:39:29 +0000 (10:39 +0800)]
Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.
Fixes:
66936807
Test: manual - long tap a connected Wi-Fi AP and
tap "Write to NFC tag".
Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
Rajeev Kumar [Tue, 26 Sep 2017 08:05:31 +0000 (08:05 +0000)]
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference. am:
298ffee39e
am:
49034b4796
Change-Id: I892a62447e183874fe3ac0568844fb2da01de151
Rajeev Kumar [Tue, 26 Sep 2017 08:00:58 +0000 (08:00 +0000)]
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
am:
298ffee39e
Change-Id: Ia322a81e7fa521679d57a5d654c17af148e1ed68
TreeHugger Robot [Tue, 26 Sep 2017 04:21:45 +0000 (04:21 +0000)]
Merge "Move the indexing back into DatabaseIndexingManager"
Colin Cross [Tue, 26 Sep 2017 01:33:08 +0000 (01:33 +0000)]
Merge "Remove unnecessary core-oj library" am:
a37bf5616a am:
00c0d436f4 am:
d3802f9ff4
am:
b4e93fe704
Change-Id: I3f428afea07473992318daed6d1d440781751853
Colin Cross [Tue, 26 Sep 2017 01:27:39 +0000 (01:27 +0000)]
Merge "Remove unnecessary core-oj library" am:
a37bf5616a am:
00c0d436f4
am:
d3802f9ff4
Change-Id: Ic4a6b40e2ff4a8a232b2f60c61765757262b2120
Colin Cross [Tue, 26 Sep 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Remove unnecessary core-oj library" am:
a37bf5616a
am:
00c0d436f4
Change-Id: I88adb043f9fbd9d35ff4ba49c15bddb8125c7b1c
Colin Cross [Tue, 26 Sep 2017 01:18:50 +0000 (01:18 +0000)]
Merge "Remove unnecessary core-oj library"
am:
a37bf5616a
Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db
Treehugger Robot [Tue, 26 Sep 2017 01:12:30 +0000 (01:12 +0000)]
Merge "Remove unnecessary core-oj library"
Kevin Chyn [Tue, 26 Sep 2017 00:06:09 +0000 (17:06 -0700)]
Update Fingerprint/PIN string to fix grammar
Fixes:
63121846
Test: manual test of setting up FP/PIN
Change-Id: Id0aa04b9f76eddea2be00cf916202a56ff1ce932
Matthew Fritze [Thu, 31 Aug 2017 21:13:06 +0000 (14:13 -0700)]
Move the indexing back into DatabaseIndexingManager
For the sake of incremental updates, we moved all of the
conversion from PreIndexData to IndexData, and the
insertion of the rows into the SQLite DB into a new class,
IndexDataConverter. However, it's real role is just to
convert PreIndexData into IndexData.
So this CL moves the insertion of the rows back into
DatabaseIndexingManager.
Again, for the sake of simplicity, I did not change the
conversion flow. Rather, instead of inserting a row at the
end of the conversion, I just put it into a list which is
then returned. This lets me move the tests to appropriate
locations, without having to change them too much.
In the tests, the references to real xml layouts are
changed to fake references. Hooray for being less brittle.
IndexDataConverter now just tests that the IndexData
has the appropriate data from PreIndexdData.
Independently, we test that IndexData gets inserted in
DatabaseIndexingManager.
In the next CL, I'll refactor the conversion
flow for readability.
Bug:
33577327
Test: make RunSettingsRoboTests
Test: Took a database dump before and after change,
and they were the same. Cool.
Change-Id: I39cc812d1f736e13a0a51af50984c239961ecf7a
jeffreyhuang [Mon, 25 Sep 2017 22:37:39 +0000 (15:37 -0700)]
Introduce WifiRoamScansPreferenceController
- Create new WifiRoamScansPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I967944e8d22d985035c94874d13e02c3f5e70781
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"
Rajeev Kumar [Mon, 25 Sep 2017 18:34:10 +0000 (11:34 -0700)]
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
This preference is not needed for Data plan settings page. This change
fixes the NPE which happens because we try to remove a preference which
is not added to the settings preference fragment.
Test: make RunSettingsRoboTests -j40
Bug:
64068792
Change-Id: Ibbcf1637b8aed1a94542ea3786170f2f318df4a9
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
Colin Cross [Sun, 24 Sep 2017 05:09:31 +0000 (22:09 -0700)]
Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.
Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
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