Commit Graph

40333 Commits

Author SHA1 Message Date
TreeHugger Robot
a81a339c1d Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
am: b87acf6837

Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
2017-08-22 20:20:19 +00:00
TreeHugger Robot
b87acf6837 Merge changes from topic "Read dun APNs from apn db"
am: f9390ce1fb

Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
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

Change-Id: I2b90fdcd5a6c88600077a0b09e693b006bf53177
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

Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
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
Soroosh Mariooryad
98fc9b139c Extending SearchFeatureProvider API to provide timeout
Bug: 38197948
Test: RunSettingsRoboTests

Change-Id: I5b04085ba93061dafe8977b42ebe5092bc9a9d09
2017-08-22 10:38:32 -07: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

Change-Id: Ib25d07629d5af5548816b61ba62991c1903d6ad8
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

Change-Id: I3482ba65bb5118af2f7eda4b3f07c5ea21caa36e
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

Change-Id: I0df8958420b72cbcf135d2aad5c095e3c10e1e06
2017-08-21 16:17:52 +00:00
Charles He
59bc90954b Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
am: 1d6cec8ca2

Change-Id: I6859c9a8b27358e1c35ca16948ff6e52ba229f80
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

Change-Id: I072a5e9253877af393ead487f7c1cae849ced441
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

Change-Id: Iecdcc2b66a665b86be2f9fd0686619e758e2b7f4
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

Change-Id: If4c8fa69fcc6b7be28a41ef8d51ffa463af19741
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

Change-Id: Ie87db0cde5fe606c31d4cfd3540adafdd98147ac
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  -s ours

Change-Id: I0fe4a487dd73db0ab27455b6744f0e5de2ee763d
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  -s ours

Change-Id: I2c7b0637f98ffaebbd2dd80e582e47078d3c28b4
2017-08-18 01:55:29 +00:00
Bill Yi
95a797f5fc Import translations. DO NOT MERGE am: 4ced4787ce -s ours
am: 5b9b88cc5b  -s ours

Change-Id: I40b762159141b73056cc04ceb18e084d49e53723
2017-08-18 01:50:29 +00:00
Bill Yi
5b9b88cc5b Import translations. DO NOT MERGE
am: 4ced4787ce  -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f
2017-08-18 01:45:26 +00:00
Bill Yi
4ced4787ce Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
2017-08-17 16:57:35 -07:00
Daniel Nishi
739b0eef10 Move the Robolectric shadow config up.
In my testing, this reduces the runtime of the Robolectric Settings test
suite on my Z840 workstation from 440 seconds to 402 seconds on average.
By avoiding having a method-level Robolectric shadow import, we avoid
going down a code path which needs to add more shadows later in the
Robolectric execution.

Bug: 64808827
Test: Settings robotests still pass
Change-Id: I7b40d73b30306ae3f9759281afbd7f7266579e24
2017-08-17 14:37:27 -07:00
Stephen Chen
dc1add0c61 Add a "Add Network" button to SavedAccessPointsWifiSettings
Bug: 36719359
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
Test: Open saved networks from WifiSettings. Ensure that exiting and
resuming the activity keeps the "Add Network" button on the bottom of
the network list. This is tested through the cases where networks are
forgotten/saved before resuming, and that pausing/resuming when the dialog
is open or closed does not affect the result.

Change-Id: Ib719a1f6b9468c0f8f44470eeed9144904672cf1
2017-08-17 14:00:30 -07:00
TreeHugger Robot
8ae8b7a931 Merge "Index TTS-Settings and dedupe TTS-engine in search result." 2017-08-17 17:30:19 +00:00
Bill Yi
0c515c104b Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 682ff5562c -s ours
am: 7189b42b4e  -s ours

Change-Id: I75bdc4b95f5f693ac00deecd7a4f729e01b711a9
2017-08-17 15:43:43 +00:00
Bill Yi
7189b42b4e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 682ff5562c  -s ours

Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15
2017-08-17 15:40:43 +00:00
TreeHugger Robot
682ff5562c Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-17 15:33:39 +00:00
Fan Zhang
5bfe4c4309 Merge "Suppress some search results" into oc-mr1-dev am: f51b4a580f
am: f8817000ac

Change-Id: I5e1d4fa050541e2ccc7b1d4c6c5edf63802ba3de
2017-08-17 07:18:10 +00:00
Maurice Lam
3e8718af51 Merge "Add fingerprint illustration image" into oc-mr1-dev am: 89c2adf420
am: 1b6307a9cc

Change-Id: Icb102ad71236e6f71e5994306da6c84da461d2fc
2017-08-17 07:16:24 +00:00
Antony Sargent
fcb1073326 Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev am: 53a77a2452
am: 811b25ac2b

Change-Id: Ifa726d167f3e352f0993aa12f4d3c11089ae03f8
2017-08-17 07:15:24 +00:00
Ruchi Kandoi
bcd3cff7a2 Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev am: 7a5e42f3db
am: 1030cf5ad4

Change-Id: Icf4fd8130e053e2b90561c5462d3f94714ac6ed5
2017-08-17 07:14:28 +00:00
Maurice Lam
a4b54e52ba Merge "Fix bad string reference" into oc-mr1-dev am: f4716e89c0
am: f7a818345d

Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
2017-08-17 07:13:41 +00:00
Fan Zhang
7e5055b30c Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev am: 9a03b951d2
am: 5c15a79fa4

Change-Id: I28d8eb7ee38102dd74b5b307f45d17ce77476878
2017-08-17 07:12:51 +00:00
Fan Zhang
f8817000ac Merge "Suppress some search results" into oc-mr1-dev
am: f51b4a580f

Change-Id: Id8f2ae517afbfef10bce9e6811178b2772a56f07
2017-08-17 01:29:44 +00:00
Maurice Lam
1b6307a9cc Merge "Add fingerprint illustration image" into oc-mr1-dev
am: 89c2adf420

Change-Id: I44edca5a3310e476dd68e25e0e16560bb5a31b5f
2017-08-17 01:23:19 +00:00
Antony Sargent
811b25ac2b Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
am: 53a77a2452

Change-Id: I5d750adc4623eacf704a12577b34f3434108b28f
2017-08-17 01:22:27 +00:00
Ruchi Kandoi
1030cf5ad4 Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
am: 7a5e42f3db

Change-Id: Ib4477e392d4f7fd2d647ddaef3088be934d31210
2017-08-17 01:21:51 +00:00