Soroosh Mariooryad
f1ea9cc668
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev am: f83b94aa0c
...
am: 4e4d3631fc
Change-Id: I5207a13fa2997cad393ec60d5f0cfb93eecbde16
2017-08-24 04:32:47 +00:00
Soroosh Mariooryad
4e4d3631fc
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
...
am: f83b94aa0c
Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c
2017-08-24 04:20:30 +00:00
TreeHugger Robot
f83b94aa0c
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
2017-08-24 04:11:48 +00:00
Stephen Chen
0246cd8a40
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev am: a78eeb2d61
...
am: 31deb9a766
Change-Id: Ibd4f9959af5c5c1bde51ce1b9285531880301daa
2017-08-24 02:17:10 +00:00
Stephen Chen
31deb9a766
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
...
am: a78eeb2d61
Change-Id: Ide908ed189c110c272cd5535f9fbc99705b8555a
2017-08-24 01:58:48 +00:00
TreeHugger Robot
a78eeb2d61
Merge "Add a "Add Network" button to SavedAccessPointsWifiSettings" into oc-mr1-dev
2017-08-24 01:43:58 +00:00
Doris Ling
d9d877cb48
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev am: d94fbbc325
...
am: c2eab36c7c
Change-Id: I09efabd3f8a4a7358f2b6a6d52a15fdd75ca7672
2017-08-24 01:11:22 +00:00
Doris Ling
c2eab36c7c
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
...
am: d94fbbc325
Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
2017-08-24 00:48:20 +00:00
TreeHugger Robot
d94fbbc325
Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev
2017-08-24 00:36:43 +00:00
jackqdyulei
a5b20303ee
Merge "Set preference invisible when no anomaly" into oc-mr1-dev am: 0e800978bf
...
am: fb13cac59f
Change-Id: I9a851fc886abb1489b8133468aed2c0548ffbd2d
2017-08-23 20:24:21 +00:00
jackqdyulei
002a20c8f3
Merge "Update strings when shortString is true" into oc-mr1-dev am: d0066e3875
...
am: 02e4c7d809
Change-Id: I031e65952befe7507ce09701af02e1131fe278cf
2017-08-23 20:15:19 +00:00
jackqdyulei
fb13cac59f
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
...
am: 0e800978bf
Change-Id: Icf0931c60d62fd9e18bc3cfe2853e965403e7740
2017-08-23 20:11:28 +00:00
jackqdyulei
02e4c7d809
Merge "Update strings when shortString is true" into oc-mr1-dev
...
am: d0066e3875
Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
2017-08-23 20:01:51 +00:00
TreeHugger Robot
0e800978bf
Merge "Set preference invisible when no anomaly" into oc-mr1-dev
2017-08-23 19:57:41 +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
4242ee0dd4
Set preference invisible when no anomaly
...
In the previous code path, we will create an invisible anomaly preference
and update it to visible if it contains any anomaly. However, when
anomaly is dismissed we don't reset preference to invisible.
So, this cl adds code to set it to invisible explicitly when anomaly list
is empty.
Bug: 64617126
Test: RunSettingsRoboTests
Change-Id: Ie7a3498da91243f05f4c47fb1cc5f67b177d04b1
2017-08-23 10:09:19 -07:00
jackqdyulei
868adaa8db
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev am: a097d68c4b
...
am: 92597b0e26
Change-Id: I68323c887d22b0f0df9801adcba436629503270b
2017-08-23 03:52:51 +00:00
jackqdyulei
92597b0e26
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
...
am: a097d68c4b
Change-Id: Ib020db1315c7e16f86bc076859187f75d79c87ee
2017-08-23 02:06: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
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
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
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
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
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
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
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
f8817000ac
Merge "Suppress some search results" into oc-mr1-dev
...
am: f51b4a580f
Change-Id: Id8f2ae517afbfef10bce9e6811178b2772a56f07
2017-08-17 01:29:44 +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
Maurice Lam
f7a818345d
Merge "Fix bad string reference" into oc-mr1-dev
...
am: f4716e89c0
Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
2017-08-17 01:21:10 +00:00
TreeHugger Robot
f51b4a580f
Merge "Suppress some search results" into oc-mr1-dev
2017-08-17 01:20:42 +00:00