Ng Zhi An
15b71d0305
Merge "Reflect device encryption status" into oc-mr1-dev am: 3de3cf85f4
...
am: 7c94fcc9bc
2017-09-23 00:34:05 +00:00
Ng Zhi An
7c94fcc9bc
Merge "Reflect device encryption status" into oc-mr1-dev
...
am: 3de3cf85f4
2017-09-23 00:32:05 +00:00
TreeHugger Robot
3de3cf85f4
Merge "Reflect device encryption status" into oc-mr1-dev
2017-09-23 00:28:27 +00:00
Doris Ling
8d4aa3f9b3
Merge "Put code that updates the access points lists inside a Handler."
2017-09-22 22:39:24 +00:00
jeffreyhuang
6177d91efe
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
2017-09-22 14:57:38 -07:00
Winson Chung
4466843b80
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev am: 625b1dd13a
...
am: 078d01c8c1
2017-09-22 21:45:46 +00:00
jackqdyulei
0b6a3bc9c4
Hide summary for type system
...
Bug: 66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6
2017-09-22 13:45:51 -07:00
Winson Chung
078d01c8c1
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
...
am: 625b1dd13a
2017-09-22 20:43:39 +00:00
Jeffrey Huang
ce7721625d
Merge "Introduce CoolColorTemperaturePreferenceController"
2017-09-22 20:38:40 +00:00
Winson Chung
625b1dd13a
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
2017-09-22 20:30:28 +00:00
TreeHugger Robot
c66e81fcbf
Merge "Import translations. DO NOT MERGE"
2017-09-22 18:50:48 +00:00
Alison Cichowlas
f4a0f80677
Notification importance/selected sound conflict fixes. am: ad1158169c
...
am: 6c76550a73
2017-09-22 18:44:07 +00:00
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
Alison Cichowlas
6c76550a73
Notification importance/selected sound conflict fixes.
...
am: ad1158169c
2017-09-22 18:23:34 +00:00
Tony Mantler
76cbd4b3b2
Make ApplicationsState.Session lifecycle-aware
...
Bug: 66682989
Test: RunSettingsRoboTests
Change-Id: Idf56788fcae22639b7bf604a8c73cd5f0ff2da16
2017-09-22 11:23:17 -07:00
Jeffrey Huang
e8ac23d93f
Merge "Introduce DebugViewAttributesPreferenceController"
2017-09-22 17:02:44 +00:00
Jeffrey Huang
1257b7bcec
Merge "Introduce LocalTerminalPreferenceController"
2017-09-22 17:01:41 +00:00
TreeHugger Robot
0660d19629
Merge "Let SuggestionFeatureProvider manage SuggestionService name"
2017-09-22 16:55:08 +00:00
Ng Zhi An
f0c0320c82
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".
2017-09-22 09:48:43 -07:00
Alison Cichowlas
ad1158169c
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
2017-09-22 10:55:27 -04:00
Alison Cichowlas
5bfead753f
Merge "Notification importance/selected sound conflict fixes."
2017-09-22 12:47:49 +00:00
Adrian Roos
d5e3c38bbe
FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme
...
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes: 65408626
Test: manual
2017-09-22 13:28:54 +02:00
Ng Zhi An
2d6ca03364
Fix icon for sim card in settings am: 097f4184fa
...
am: a81e3e3c8e
2017-09-22 06:37:24 +00:00
Ng Zhi An
a81e3e3c8e
Fix icon for sim card in settings
...
am: 097f4184fa
2017-09-22 06:35:24 +00:00
Fan Zhang
6598a7b4cd
Let SuggestionFeatureProvider manage SuggestionService name
...
Bug: 65065268
Test: robotests
Change-Id: I82315a7b1565dc34b516bf685ad8e831a1e28591
2017-09-21 18:25:40 -07:00
jeffreyhuang
af7737c15c
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
2017-09-21 17:02:29 -07:00
jeffreyhuang
2ebb0dd1d6
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
2017-09-21 16:23:04 -07:00
TreeHugger Robot
d0b1297e84
Merge "Fixing issue with PiP settings not showing apps for other profiles."
2017-09-21 23:08:48 +00:00
Ng Zhi An
097f4184fa
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
2017-09-21 15:20:36 -07:00
Alison Cichowlas
bff0e971ca
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
2017-09-21 17:36:32 -04: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
e8b8633181
Fixing issue with PiP settings not showing apps for other profiles.
...
Bug: 65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: If3562dc7c2ddf07e2fc19591238dc3a7b4e9dba7
Merged-In: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
2017-09-21 09:40:42 -07: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
