jackqdyulei
002a20c8f3
Merge "Update strings when shortString is true" into oc-mr1-dev am: d0066e3875
...
am: 02e4c7d809
2017-08-23 20:15:19 +00:00
jackqdyulei
02e4c7d809
Merge "Update strings when shortString is true" into oc-mr1-dev
...
am: d0066e3875
2017-08-23 20:01:51 +00:00
TreeHugger Robot
d0066e3875
Merge "Update strings when shortString is true" into oc-mr1-dev
2017-08-23 19:38:40 +00:00
TreeHugger Robot
335ba1bf41
Merge "Fix to show correct value for data limit setting"
2017-08-23 19:12:04 +00:00
jackqdyulei
868adaa8db
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev am: a097d68c4b
...
am: 92597b0e26
2017-08-23 03:52:51 +00:00
Kevin Chyn
47784a1cb0
Merge "Pattern entry views should be consistent" into oc-mr1-dev am: a6b67d15eb
...
am: d328b9051c
2017-08-23 03:52:09 +00:00
Amit Mahajan
9c2074d40a
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422 am: f70f53473a am: 4bb56f5282
...
am: 6afddc2308
2017-08-23 03:51:20 +00:00
jackqdyulei
92597b0e26
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
...
am: a097d68c4b
2017-08-23 02:06:12 +00:00
Kevin Chyn
d328b9051c
Merge "Pattern entry views should be consistent" into oc-mr1-dev
...
am: a6b67d15eb
2017-08-23 01:43:12 +00:00
TreeHugger Robot
a097d68c4b
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
2017-08-23 01:42:42 +00:00
Steven Timotius
72ebf8fe35
Fix to show correct value for data limit setting
...
Bug: 64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
2017-08-22 17:47:12 -07:00
TreeHugger Robot
b3351a1b14
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837 am: a81a339c1d -s ours am: a211db7af3
...
am: 1c7988b11b
2017-08-23 00:47:03 +00:00
TreeHugger Robot
a6b67d15eb
Merge "Pattern entry views should be consistent" into oc-mr1-dev
2017-08-23 00:24:13 +00:00
Amit Mahajan
6afddc2308
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422 am: f70f53473a
...
am: 4bb56f5282
2017-08-23 00:07:47 +00:00
TreeHugger Robot
1c7988b11b
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837 am: a81a339c1d -s ours
...
am: a211db7af3
2017-08-22 23:48:07 +00:00
Amit Mahajan
4bb56f5282
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422
...
am: f70f53473a
2017-08-22 23:47:07 +00:00
TreeHugger Robot
a211db7af3
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
...
am: a81a339c1d
2017-08-22 23:31:10 +00:00
Amit Mahajan
f70f53473a
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
...
am: b2498bc422
2017-08-22 21:19:52 +00:00
Amit Mahajan
b2498bc422
Merge "Change to not cache user entered apn type as user may change it."
...
am: 54eeafa052
2017-08-22 21:09:12 +00:00
Treehugger Robot
54eeafa052
Merge "Change to not cache user entered apn type as user may change it."
2017-08-22 21:02:03 +00:00
TreeHugger Robot
a81a339c1d
Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
...
am: b87acf6837
2017-08-22 20:20:19 +00:00
TreeHugger Robot
b87acf6837
Merge changes from topic "Read dun APNs from apn db"
...
am: f9390ce1fb
2017-08-22 20:03:24 +00:00
Treehugger Robot
f9390ce1fb
Merge changes from topic "Read dun APNs from apn db"
...
* changes:
Change empty apn type in user entered APN to non-read-only types.
Check for null mReadOnlyApnTypes.
Disallow adding/editing dun APNs unless allowed by carrier.
2017-08-22 19:52:21 +00:00
Amit Mahajan
efe090ec60
Change to not cache user entered apn type as user may change it.
...
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-22 19:36:45 +00:00
Tony Mak
35efb10206
Merge "A separate entry for work profile CA cert" into oc-mr1-dev am: e040ef4a39
...
am: 237e49a7c9
2017-08-22 18:24:05 +00:00
Tony Mak
237e49a7c9
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
...
am: e040ef4a39
2017-08-22 18:21:35 +00:00
TreeHugger Robot
937e2d5a8e
Change empty apn type in user entered APN to non-read-only types.
...
Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417
Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3
2017-08-22 18:20:32 +00:00
Amit Mahajan
2bfc9906c1
Check for null mReadOnlyApnTypes.
...
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
2017-08-22 11:09:42 -07:00
Amit Mahajan
607e684f64
Disallow adding/editing dun APNs unless allowed by carrier.
...
Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
2017-08-22 11:09:42 -07:00
TreeHugger Robot
e040ef4a39
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
2017-08-22 18:04:00 +00:00
Tony Mak
c74bbcd3b2
A separate entry for work profile CA cert
...
We mixed both primary and work profile CA certs into single entry
previously which is not aligned with the CTS requirement.
Separate them from now.
Test: m -j RoboSettingsTest
Test: Run related manual test in CtsVerifier
Bug: 64567417
Change-Id: Iaff2d9f25ef15b96c11727e7075bdae8e90ec8ce
2017-08-22 18:24:30 +01:00
Kevin Chyn
e4cfb6a594
Pattern entry views should be consistent
...
This change makes confirm_pattern consistent with choose_pattern
Fixes: 27290562
Test: manual
Change-Id: Id56492df71624552c8362f648756ba64bf908965
2017-08-22 01:16:08 +00:00
Roozbeh Pournader
44e8299acd
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev am: 0f5fadcb0e
...
am: cab12d6afa
2017-08-21 17:58:36 +00:00
Roozbeh Pournader
cab12d6afa
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev
...
am: 0f5fadcb0e
2017-08-21 17:50:07 +00:00
TreeHugger Robot
0f5fadcb0e
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev
2017-08-21 17:32:25 +00:00
Charles He
897f396b16
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev am: 1d6cec8ca2
...
am: 59bc90954b
2017-08-21 16:17:52 +00:00
Charles He
59bc90954b
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
...
am: 1d6cec8ca2
2017-08-21 16:12:50 +00:00
Charles He
1d6cec8ca2
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
2017-08-21 16:04:38 +00:00
Roozbeh Pournader
4fb3e719d2
Set the bidi flags on Paints in DonutView
...
Previously, DonutView used Canvas.drawText with a Paint with default
bidi directions, which is LTR. This meant that even in RTL locales,
text was displayed assuming the direction of the paragraph the text
was appearing in was LTR. This caused an incorrect display of Arabic
percentages.
Now we set the Paint bidiFlags according to the Locale's direction.
Change-Id: Ic10228b8a23dc49de60246c37adfbaf7f8fd4e9e
Fixes: 63767043
Test: Manual (tested in ar-EG, ar-MA, fa-IR, ur-PK, and he-IL locales)
2017-08-18 23:35:03 +00:00
TreeHugger Robot
535a545c0d
Merge "Temporarily turn off Settings CodeInspection test"
2017-08-18 22:46:31 +00:00
Antony Sargent
e9ef169eee
Temporarily turn off Settings CodeInspection test
...
Something is causing our ClassScanner to find 0 classes in the
com.android.settings class, which causes the CodeInspection test to
fail. This CL temporarily disables these tests to get the tree green
while we further investigate the root cause of the problem.
Bug: 64840107
Test: make RunSettingsRoboTests should succeed
Change-Id: I65485b41b161c2d54227ab179675bf9e3a23bab9
2017-08-18 13:58:41 -07:00
Phil Weaver
2749133882
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev am: 6c9a1262be
...
am: 9e75a52c45
2017-08-18 20:56:18 +00:00
Phil Weaver
9e75a52c45
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
...
am: 6c9a1262be
2017-08-18 20:41:57 +00:00
Phil Weaver
6c9a1262be
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
2017-08-18 20:20:47 +00:00
Charles He
caf9510923
Clear "Wrong pattern" prompt automatically.
...
When the user enters a wrong pattern/pin/password, a "Wrong
pattern/pin/password" text shows up on ConfirmLockPattern or
ConfirmLockPassword screen. In ConfirmLockPassword, it disappears
automatically after 3 seconds, whereas it doesn't in ConfirmLockPattern.
In this change, we make the prompt in ConfirmLockPattern disappear
automatically as well.
Bug: 64781905
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I53a25576413671ced4197064d51fbcc397733265
2017-08-18 17:35:27 +01:00
Beverly
f1e4e4fdd3
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am: 268c6c6ca6
...
am: 7ba9e9f849
2017-08-18 14:19:20 +00:00
Beverly
7ba9e9f849
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
...
am: 268c6c6ca6
2017-08-18 14:13:20 +00:00
TreeHugger Robot
268c6c6ca6
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
2017-08-18 14:08:24 +00:00
Bill Yi
e576f0393e
Import translations. DO NOT MERGE am: 4ced4787ce -s ours am: 5b9b88cc5b -s ours am: 95a797f5fc -s ours
...
am: 2d9251f32f
2017-08-18 02:41:25 +00:00
Bill Yi
2d9251f32f
Import translations. DO NOT MERGE am: 4ced4787ce -s ours am: 5b9b88cc5b -s ours
...
am: 95a797f5fc
2017-08-18 01:55:29 +00:00
