Svet Ganov
6adbad6937
Merge "Use new no overlay flag instead app ops" into oc-mr1-dev
...
am: 9cb867d6e3
2017-10-04 20:53:02 +00:00
TreeHugger Robot
9cb867d6e3
Merge "Use new no overlay flag instead app ops" into oc-mr1-dev
2017-10-04 20:38:58 +00:00
Salvador Martinez
f110a3c3ed
Merge "Update support to not need dialog fragment" into oc-mr1-dev
...
am: 47dd955fad
2017-10-04 18:42:12 +00:00
TreeHugger Robot
47dd955fad
Merge "Update support to not need dialog fragment" into oc-mr1-dev
2017-10-04 18:35:32 +00:00
Salvador Martinez
bb4ef4d1b6
Update support to not need dialog fragment
...
This CL update support to not need the dialog fragment.
Test: robotests
Bug: 65552746
Change-Id: Ic4a21f05f04384795f4e616c2d6d914fc7dd3510
2017-10-03 12:28:43 -07:00
Soroosh Mariooryad
73679c124f
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev
...
am: 0193e69597
2017-10-03 18:36:05 +00:00
TreeHugger Robot
0193e69597
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev
2017-10-03 18:31:56 +00:00
Svet Ganov
e53d1caedc
Use new no overlay flag instead app ops
...
Test: updated DrawOverlayDetailsTest passes
bug:66936547
Change-Id: I7c17c95a2b44fd2ffd593a6eb03a16be034e9192
2017-10-02 21:00:43 -07:00
Bill Yi
2032410de4
Import translations. DO NOT MERGE
...
am: 6fe50e7224
2017-10-02 19:09:02 +00:00
Carsten Hauge
143b31959b
Merge "Avoid NullPointerException when updating preference intents" am: c4b0fa5858 am: f38ed428dc
...
am: 5d2919907b
2017-10-02 18:10:49 +00:00
Carsten Hauge
5d2919907b
Merge "Avoid NullPointerException when updating preference intents" am: c4b0fa5858
...
am: f38ed428dc
2017-10-02 18:06:32 +00:00
Carsten Hauge
f38ed428dc
Merge "Avoid NullPointerException when updating preference intents"
...
am: c4b0fa5858
2017-10-02 18:03:40 +00:00
Treehugger Robot
c4b0fa5858
Merge "Avoid NullPointerException when updating preference intents"
2017-10-02 17:56:02 +00:00
Bill Yi
6fe50e7224
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ib580d3bc9d6b979d5da92cc4ef3f207acdfaa48e
2017-10-02 08:23:49 -07:00
Carsten Hauge
f35cb6bc91
Avoid NullPointerException when updating preference intents
...
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.
Fixes: 67075850
Test: manual - go to Settings > Users & accounts and tap an account.
Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
2017-10-02 02:01:49 +00:00
songkailun
806af289e8
Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1 am: 39ddac51b6
...
am: 109d0bafd4
2017-09-29 19:04:56 +00:00
songkailun
109d0bafd4
Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1
...
am: 39ddac51b6
2017-09-29 14:46:23 +00:00
songkailun
39ddac51b6
Merge "Fix wrong format in AndroidManifest.xml"
...
am: de795d12d1
2017-09-29 09:37:17 +00:00
Treehugger Robot
de795d12d1
Merge "Fix wrong format in AndroidManifest.xml"
2017-09-29 06:45:30 +00:00
songkailun
7d2a5901f7
Fix wrong format in AndroidManifest.xml
...
N/A
Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-09-29 09:42:05 +08:00
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
