Bill Yi
532f150227
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: d5b9fec389
2017-09-28 19:33:32 +00:00
TreeHugger Robot
d5b9fec389
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-28 19:17:32 +00:00
Bill Yi
fe3b62fd1e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: If92f24f85c26217b251503d846183f80da8b75ba
2017-09-27 19:51:32 -07:00
jackqdyulei
da9247d645
Merge "Hide summary for type system" into oc-mr1-dev
...
am: aadee0997c
2017-09-28 02:17:08 +00:00
TreeHugger Robot
aadee0997c
Merge "Hide summary for type system" into oc-mr1-dev
2017-09-28 02:11:54 +00:00
Doris Ling
eccb0fcff9
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
...
am: d52c4482e4
2017-09-28 02:05:10 +00:00
TreeHugger Robot
d52c4482e4
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
2017-09-28 01:58:47 +00:00
Chien-Yu Chen
f0c328ed78
Settings: Show HAL HDR+ option in user build
...
am: 4d26fa03a8
2017-09-27 23:33:01 +00:00
Chien-Yu Chen
4d26fa03a8
Settings: Show HAL HDR+ option in user build
...
Test: CameraHalHdrplusPreferenceControllerTest
Bug: 66919557
Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b
2017-09-27 14:03:12 -07:00
Bill Yi
bcac4b4c7b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 56555e0403
2017-09-27 02:55:05 +00:00
TreeHugger Robot
56555e0403
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-27 02:50:26 +00:00
Lei Yang
255b8a219a
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am: d2f42970bf am: a40f7c0f5e
...
am: 17b5110539
2017-09-26 23:43:48 +00:00
Lei Yang
17b5110539
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am: d2f42970bf
...
am: a40f7c0f5e
2017-09-26 23:39:35 +00:00
Bill Yi
e566ed9e17
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I55b6e616f1dd402c1c0cb7d17f593d4b7d904d85
2017-09-26 16:36:49 -07:00
Lei Yang
a40f7c0f5e
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
...
am: d2f42970bf
2017-09-26 23:35:26 +00:00
Treehugger Robot
d2f42970bf
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
2017-09-26 23:21:44 +00:00
Lei Yang
58fca6385a
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
2017-09-26 10:20:29 +00:00
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
Soroosh Mariooryad
2aab11772d
Fix ANR issue caused by sharedpref commit() on suggestion event logging
...
Test: RunSettingsRoboTests
Fixes: 66719302
Change-Id: I5e99a279d5c72409b8ca982148396f7d1e0d46b7
2017-09-22 16:10:13 -07: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
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
Doris Ling
308a2d93fb
Move listening to brightness changes to onStart/onStop.
...
Currently, we register the brightness listener in onResume() and stop
listening in onPause(). When we launch the brightness selection bar, the
display settings is paused, and hence we don't get the brightness
update, and only refresh the percentage when the brightness bar is
dismissed.
Moving the listening logic to onStart()/onStop() instead, so that we
will get the updates all the time when the display settings is launched.
Change-Id: I6ed9c8485fdf7721374baff5cea5f7011b63d7ea
Fixes: 65981061
Test: make RunSettingsRoboTests
2017-09-20 15:36:14 -07:00
