Rajeev Kumar
49034b4796
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
...
am: 298ffee39e
2017-09-26 08:00:58 +00:00
Colin Cross
b4e93fe704
Merge "Remove unnecessary core-oj library" am: a37bf5616a am: 00c0d436f4
...
am: d3802f9ff4
2017-09-26 01:27:39 +00:00
Colin Cross
d3802f9ff4
Merge "Remove unnecessary core-oj library" am: a37bf5616a
...
am: 00c0d436f4
2017-09-26 01:23:12 +00:00
Colin Cross
00c0d436f4
Merge "Remove unnecessary core-oj library"
...
am: a37bf5616a
2017-09-26 01:18:50 +00:00
Treehugger Robot
a37bf5616a
Merge "Remove unnecessary core-oj library"
2017-09-26 01:12:30 +00:00
Rajeev Kumar
298ffee39e
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
2017-09-25 11:34:10 -07:00
Adrian Roos
fce69dbb56
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
...
am: eafcc98ab8
2017-09-25 11:17:22 +00:00
TreeHugger Robot
eafcc98ab8
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
2017-09-25 11:11:53 +00:00
Colin Cross
6be287a209
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
2017-09-23 22:09:31 -07: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
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
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
Alison Cichowlas
6c76550a73
Notification importance/selected sound conflict fixes.
...
am: ad1158169c
2017-09-22 18:23:34 +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
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
a81e3e3c8e
Fix icon for sim card in settings
...
am: 097f4184fa
2017-09-22 06:35:24 +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
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
Doris Ling
cd959f28a0
Merge "Fix NPE crash in UsageAccessDetails"
2017-09-21 19:21:03 +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
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
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
Jack He
1197438540
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
...
am: ac040e3b1f
2017-09-20 21:43:24 +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
Fan Zhang
a404be0032
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
...
am: b9da1117d0
2017-09-20 16:33:48 +00: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
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
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
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
Ajay Nadathur
a7ca53bc41
Deferred setup banner updates intermittently
...
bug: 65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
2017-09-19 18:50:25 +00:00
Christine Franks
c6c299bdbb
Handle night display state when timezone changes
...
Bug: 64458884
Test: make RunSettingsRoboTests -j100
Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
2017-09-19 10:54:13 -07:00
Fan Zhang
c8bff87a9f
Turn off WifiTetherSettings page.
...
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes: 65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
2017-09-19 10:16:38 -07:00
Bill Yi
f874590924
Import translations. DO NOT MERGE
...
am: 0a0d3d1b86
2017-09-19 01:02:54 +00:00
Bill Yi
0a0d3d1b86
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I26590b243087f80f96d29114d82a45acb4070f73
2017-09-18 14:15:14 -07:00
Bill Yi
c30ad68d13
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: e28f601df8
2017-09-16 20:36:29 +00:00
TreeHugger Robot
e28f601df8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 19:39:25 +00:00
Bill Yi
59c56a56f8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Iee41ee02215987d998f059b69c085479fcefbf29
2017-09-16 07:25:49 -07:00
Fan Zhang
3f070569a6
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
...
am: a42e9351c5
2017-09-16 00:38:15 +00:00
