OSDN Git Service
jackqdyulei [Wed, 23 Aug 2017 20:15:19 +0000 (20:15 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev am:
d0066e3875
am:
02e4c7d809
Change-Id: I031e65952befe7507ce09701af02e1131fe278cf
jackqdyulei [Wed, 23 Aug 2017 20:01:51 +0000 (20:01 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
am:
d0066e3875
Change-Id: Ifce24bf0b5df7b912d3859d6aacdb35a90ce9c29
TreeHugger Robot [Wed, 23 Aug 2017 19:38:40 +0000 (19:38 +0000)]
Merge "Update strings when shortString is true" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:12:04 +0000 (19:12 +0000)]
Merge "Fix to show correct value for data limit setting"
jackqdyulei [Wed, 23 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev am:
a097d68c4b
am:
92597b0e26
Change-Id: I68323c887d22b0f0df9801adcba436629503270b
Kevin Chyn [Wed, 23 Aug 2017 03:52:09 +0000 (03:52 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev am:
a6b67d15eb
am:
d328b9051c
Change-Id: Ie2d3605d0cf6d8057981d48bdabb0e67645e0a34
Amit Mahajan [Wed, 23 Aug 2017 03:51:20 +0000 (03:51 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422 am:
f70f53473a am:
4bb56f5282
am:
6afddc2308
Change-Id: I8ca45f06f6c37a7deadf4dbc91f0e4bc06ba04c9
jackqdyulei [Wed, 23 Aug 2017 02:06:12 +0000 (02:06 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
am:
a097d68c4b
Change-Id: Ib020db1315c7e16f86bc076859187f75d79c87ee
Kevin Chyn [Wed, 23 Aug 2017 01:43:12 +0000 (01:43 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
am:
a6b67d15eb
Change-Id: Icb5ec09a66aadf48a81f33d57aacbb52d05f9c2f
TreeHugger Robot [Wed, 23 Aug 2017 01:42:42 +0000 (01:42 +0000)]
Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev
Steven Timotius [Wed, 23 Aug 2017 00:47:12 +0000 (17:47 -0700)]
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
TreeHugger Robot [Wed, 23 Aug 2017 00:47:03 +0000 (00:47 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837 am:
a81a339c1d -s ours am:
a211db7af3
am:
1c7988b11b
Change-Id: I096036c643f417655b98283371acafeab43bd25f
TreeHugger Robot [Wed, 23 Aug 2017 00:24:13 +0000 (00:24 +0000)]
Merge "Pattern entry views should be consistent" into oc-mr1-dev
Amit Mahajan [Wed, 23 Aug 2017 00:07:47 +0000 (00:07 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422 am:
f70f53473a
am:
4bb56f5282
Change-Id: I1862129b9ec0e2c20981586cf29c672f30c2912f
TreeHugger Robot [Tue, 22 Aug 2017 23:48:07 +0000 (23:48 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837 am:
a81a339c1d -s ours
am:
a211db7af3
Change-Id: Icf1a718d443c1f72d1ddcd35c565fd0afa6c6222
Amit Mahajan [Tue, 22 Aug 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052 am:
b2498bc422
am:
f70f53473a
Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db
TreeHugger Robot [Tue, 22 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb am:
b87acf6837
am:
a81a339c1d -s ours
Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a
Amit Mahajan [Tue, 22 Aug 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Change to not cache user entered apn type as user may change it." am:
54eeafa052
am:
b2498bc422
Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac
Amit Mahajan [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
am:
54eeafa052
Change-Id: I33e32ee2d4a9e09f1fb6c383eb7e1d7e8a081c2c
Treehugger Robot [Tue, 22 Aug 2017 21:02:03 +0000 (21:02 +0000)]
Merge "Change to not cache user entered apn type as user may change it."
TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]
Merge changes from topic "Read dun APNs from apn db" am:
f9390ce1fb
am:
b87acf6837
Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf
TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]
Merge changes from topic "Read dun APNs from apn db"
am:
f9390ce1fb
Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c
Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]
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.
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
Tony Mak [Tue, 22 Aug 2017 18:24:05 +0000 (18:24 +0000)]
Merge "A separate entry for work profile CA cert" into oc-mr1-dev am:
e040ef4a39
am:
237e49a7c9
Change-Id: I2b90fdcd5a6c88600077a0b09e693b006bf53177
Tony Mak [Tue, 22 Aug 2017 18:21:35 +0000 (18:21 +0000)]
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am:
e040ef4a39
Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]
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
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]
Disallow adding/editing dun APNs unless allowed by carrier.
Test: WIP
Bug:
38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
TreeHugger Robot [Tue, 22 Aug 2017 18:04:00 +0000 (18:04 +0000)]
Merge "A separate entry for work profile CA cert" into oc-mr1-dev
Tony Mak [Fri, 18 Aug 2017 10:08:20 +0000 (11:08 +0100)]
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
Kevin Chyn [Tue, 22 Aug 2017 00:24:52 +0000 (17:24 -0700)]
Pattern entry views should be consistent
This change makes confirm_pattern consistent with choose_pattern
Fixes:
27290562
Test: manual
Change-Id: Id56492df71624552c8362f648756ba64bf908965
Roozbeh Pournader [Mon, 21 Aug 2017 17:58:36 +0000 (17:58 +0000)]
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev am:
0f5fadcb0e
am:
cab12d6afa
Change-Id: Ib25d07629d5af5548816b61ba62991c1903d6ad8
Roozbeh Pournader [Mon, 21 Aug 2017 17:50:07 +0000 (17:50 +0000)]
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev
am:
0f5fadcb0e
Change-Id: I3482ba65bb5118af2f7eda4b3f07c5ea21caa36e
TreeHugger Robot [Mon, 21 Aug 2017 17:32:25 +0000 (17:32 +0000)]
Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev
Charles He [Mon, 21 Aug 2017 16:17:52 +0000 (16:17 +0000)]
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev am:
1d6cec8ca2
am:
59bc90954b
Change-Id: I0df8958420b72cbcf135d2aad5c095e3c10e1e06
Charles He [Mon, 21 Aug 2017 16:12:50 +0000 (16:12 +0000)]
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
am:
1d6cec8ca2
Change-Id: I6859c9a8b27358e1c35ca16948ff6e52ba229f80
Charles He [Mon, 21 Aug 2017 16:04:38 +0000 (16:04 +0000)]
Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev
Roozbeh Pournader [Thu, 17 Aug 2017 23:07:52 +0000 (16:07 -0700)]
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)
TreeHugger Robot [Fri, 18 Aug 2017 22:46:31 +0000 (22:46 +0000)]
Merge "Temporarily turn off Settings CodeInspection test"
Antony Sargent [Fri, 18 Aug 2017 20:58:41 +0000 (13:58 -0700)]
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
Phil Weaver [Fri, 18 Aug 2017 20:56:18 +0000 (20:56 +0000)]
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev am:
6c9a1262be
am:
9e75a52c45
Change-Id: I072a5e9253877af393ead487f7c1cae849ced441
Phil Weaver [Fri, 18 Aug 2017 20:41:57 +0000 (20:41 +0000)]
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
am:
6c9a1262be
Change-Id: Iecdcc2b66a665b86be2f9fd0686619e758e2b7f4
Phil Weaver [Fri, 18 Aug 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev
Charles He [Fri, 18 Aug 2017 16:35:27 +0000 (17:35 +0100)]
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
Beverly [Fri, 18 Aug 2017 14:19:20 +0000 (14:19 +0000)]
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev am:
268c6c6ca6
am:
7ba9e9f849
Change-Id: If4c8fa69fcc6b7be28a41ef8d51ffa463af19741
Beverly [Fri, 18 Aug 2017 14:13:20 +0000 (14:13 +0000)]
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
am:
268c6c6ca6
Change-Id: Ie87db0cde5fe606c31d4cfd3540adafdd98147ac
TreeHugger Robot [Fri, 18 Aug 2017 14:08:24 +0000 (14:08 +0000)]
Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev
Bill Yi [Fri, 18 Aug 2017 02:41:25 +0000 (02:41 +0000)]
Import translations. DO NOT MERGE am:
4ced4787ce -s ours am:
5b9b88cc5b -s ours am:
95a797f5fc -s ours
am:
2d9251f32f -s ours
Change-Id: I0fe4a487dd73db0ab27455b6744f0e5de2ee763d
Bill Yi [Fri, 18 Aug 2017 01:55:29 +0000 (01:55 +0000)]
Import translations. DO NOT MERGE am:
4ced4787ce -s ours am:
5b9b88cc5b -s ours
am:
95a797f5fc -s ours
Change-Id: I2c7b0637f98ffaebbd2dd80e582e47078d3c28b4
Bill Yi [Fri, 18 Aug 2017 01:50:29 +0000 (01:50 +0000)]
Import translations. DO NOT MERGE am:
4ced4787ce -s ours
am:
5b9b88cc5b -s ours
Change-Id: I40b762159141b73056cc04ceb18e084d49e53723
Bill Yi [Fri, 18 Aug 2017 01:45:26 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
4ced4787ce -s ours
Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f
Bill Yi [Thu, 17 Aug 2017 23:57:35 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e
TreeHugger Robot [Thu, 17 Aug 2017 17:30:19 +0000 (17:30 +0000)]
Merge "Index TTS-Settings and dedupe TTS-engine in search result."
Bill Yi [Thu, 17 Aug 2017 15:43:43 +0000 (15:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
682ff5562c -s ours
am:
7189b42b4e -s ours
Change-Id: I75bdc4b95f5f693ac00deecd7a4f729e01b711a9
Bill Yi [Thu, 17 Aug 2017 15:40:43 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
682ff5562c -s ours
Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15
TreeHugger Robot [Thu, 17 Aug 2017 15:33:39 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Fan Zhang [Thu, 17 Aug 2017 07:18:10 +0000 (07:18 +0000)]
Merge "Suppress some search results" into oc-mr1-dev am:
f51b4a580f
am:
f8817000ac
Change-Id: I5e1d4fa050541e2ccc7b1d4c6c5edf63802ba3de
Maurice Lam [Thu, 17 Aug 2017 07:16:24 +0000 (07:16 +0000)]
Merge "Add fingerprint illustration image" into oc-mr1-dev am:
89c2adf420
am:
1b6307a9cc
Change-Id: Icb102ad71236e6f71e5994306da6c84da461d2fc
Antony Sargent [Thu, 17 Aug 2017 07:15:24 +0000 (07:15 +0000)]
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev am:
53a77a2452
am:
811b25ac2b
Change-Id: Ifa726d167f3e352f0993aa12f4d3c11089ae03f8
Ruchi Kandoi [Thu, 17 Aug 2017 07:14:28 +0000 (07:14 +0000)]
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev am:
7a5e42f3db
am:
1030cf5ad4
Change-Id: Icf4fd8130e053e2b90561c5462d3f94714ac6ed5
Maurice Lam [Thu, 17 Aug 2017 07:13:41 +0000 (07:13 +0000)]
Merge "Fix bad string reference" into oc-mr1-dev am:
f4716e89c0
am:
f7a818345d
Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
Fan Zhang [Thu, 17 Aug 2017 07:12:51 +0000 (07:12 +0000)]
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev am:
9a03b951d2
am:
5c15a79fa4
Change-Id: I28d8eb7ee38102dd74b5b307f45d17ce77476878
Fan Zhang [Thu, 17 Aug 2017 01:29:44 +0000 (01:29 +0000)]
Merge "Suppress some search results" into oc-mr1-dev
am:
f51b4a580f
Change-Id: Id8f2ae517afbfef10bce9e6811178b2772a56f07
Maurice Lam [Thu, 17 Aug 2017 01:23:19 +0000 (01:23 +0000)]
Merge "Add fingerprint illustration image" into oc-mr1-dev
am:
89c2adf420
Change-Id: I44edca5a3310e476dd68e25e0e16560bb5a31b5f
Antony Sargent [Thu, 17 Aug 2017 01:22:27 +0000 (01:22 +0000)]
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
am:
53a77a2452
Change-Id: I5d750adc4623eacf704a12577b34f3434108b28f
Ruchi Kandoi [Thu, 17 Aug 2017 01:21:51 +0000 (01:21 +0000)]
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
am:
7a5e42f3db
Change-Id: Ib4477e392d4f7fd2d647ddaef3088be934d31210
Maurice Lam [Thu, 17 Aug 2017 01:21:10 +0000 (01:21 +0000)]
Merge "Fix bad string reference" into oc-mr1-dev
am:
f4716e89c0
Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
TreeHugger Robot [Thu, 17 Aug 2017 01:20:42 +0000 (01:20 +0000)]
Merge "Suppress some search results" into oc-mr1-dev
Fan Zhang [Thu, 17 Aug 2017 01:20:19 +0000 (01:20 +0000)]
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
am:
9a03b951d2
Change-Id: If754d6e11ef3d39d716b41a3219a5d30c48fc218
TreeHugger Robot [Thu, 17 Aug 2017 00:49:00 +0000 (00:49 +0000)]
Merge "Add fingerprint illustration image" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Fix rotation bug in Bluetooth pairing PIN dialog" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 00:32:40 +0000 (00:32 +0000)]
Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Fix bad string reference" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 22:57:24 +0000 (22:57 +0000)]
Merge "Remove gibberish summary in search when query is "lock"" into oc-mr1-dev
Fan Zhang [Wed, 16 Aug 2017 22:18:33 +0000 (15:18 -0700)]
Index TTS-Settings and dedupe TTS-engine in search result.
Fixes:
63022866
Test: robotests
Change-Id: I5c711e7bafba4e413ee271768c58742be05d8640
Fan Zhang [Fri, 11 Aug 2017 01:15:37 +0000 (18:15 -0700)]
Suppress some search results
Fixes:
62137086
Test: reindex search
Test: robotests
Change-Id: I12e873edade80e4c0007d10352fb037b3230c643
Suprabh Shukla [Wed, 16 Aug 2017 22:21:36 +0000 (22:21 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours am:
9a416573d7 -s ours am:
a5e4dd2b5e -s ours
am:
e66117f59a -s ours
Change-Id: I011728958246fb831f4f2826ac2cc8021f1af266
Suprabh Shukla [Wed, 16 Aug 2017 22:20:45 +0000 (22:20 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours am:
8fe20711fa -s ours am:
7b59fe50a7 -s ours
am:
fdaa7b8c99 -s ours
Change-Id: Ib039b438b830555955bb35144d8b747c6577735a
Antony Sargent [Tue, 15 Aug 2017 16:31:31 +0000 (09:31 -0700)]
Fix rotation bug in Bluetooth pairing PIN dialog
BluetoothPairingDialogFragment has code that makes the OK button on the
dialog disabled until the user has entered at least one character into
the PIN field. However it didn't properly handle the case where the user
had entered some text and then rotated the screen - because it always
marked the OK button as disabled during onShow even if it already had
some content. This CL fixes that by looking at the text content and only
disabling the OK button if the content is empty.
Bug:
36514895
Test: make RunSettingsRoboTests
Change-Id: I4e8e70089a862e67b20ff614bbaa64fc2b641fd4
Suprabh Shukla [Wed, 16 Aug 2017 22:19:28 +0000 (22:19 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours am:
bbe3047d1d -s ours am:
832dde9768 -s ours
am:
2f0f816959 -s ours
Change-Id: Id96c2fb9aeced8d8a2100e8e221c92646f08fef0
Suprabh Shukla [Wed, 16 Aug 2017 22:18:30 +0000 (22:18 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours am:
9a416573d7 -s ours am:
7d1286299e -s ours
am:
1200158d1c -s ours
Change-Id: Ia67b46d7005a45cc53b09e18df168790887910c9
Suprabh Shukla [Wed, 16 Aug 2017 22:17:21 +0000 (22:17 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours am:
8fe20711fa -s ours am:
1b3f6d0e47 -s ours
am:
115fa8b9ed -s ours
Change-Id: I55dc132460325dc9b679ae6a0fb2351be0016754
Suprabh Shukla [Wed, 16 Aug 2017 22:16:41 +0000 (22:16 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours am:
bbe3047d1d -s ours am:
3691da8b51 -s ours
am:
ae9cc97c95 -s ours
Change-Id: I421f9248cb80f3ff833073f60f227649db76b7b0
Suprabh Shukla [Wed, 16 Aug 2017 22:15:57 +0000 (22:15 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours am:
d430178ba4 -s ours am:
e237bdb4e2 -s ours
am:
ba5593db99 -s ours
Change-Id: Ic18241bfdd81f65a2d89bb2e8e1d55d6c75c41bb
Suprabh Shukla [Wed, 16 Aug 2017 22:15:07 +0000 (22:15 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours am:
c62f6f30bc -s ours am:
c180be3468 -s ours
am:
3446f3c393 -s ours
Change-Id: Ie1b3e251ad7dc99e009a09693c6563473f5ae16e
Suprabh Shukla [Wed, 16 Aug 2017 22:13:52 +0000 (22:13 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours am:
5575d285db -s ours am:
8024f41ec1 -s ours
am:
6337780f60 -s ours
Change-Id: I37380b3a342cc0d6b741b2fafb8e26df1e95c0ff
Suprabh Shukla [Wed, 16 Aug 2017 22:12:55 +0000 (22:12 +0000)]
Merge "Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours am:
f52c8ccbfc -s ours" into oc-dr1-dev-plus-aosp am:
910f4fb003 -s ours
am:
2b5568ceee -s ours
Change-Id: I978748603bbd40004463c8c096002e8a51a77699
Fan Zhang [Wed, 16 Aug 2017 19:45:22 +0000 (12:45 -0700)]
Remove gibberish summary in search when query is "lock"
Fixes:
64165687
Test: visual for search
Test: rerun robotest for securitysettings
Change-Id: I5c44e351a767c7ce3037a81d0932d9bd6b59635e
Suprabh Shukla [Wed, 16 Aug 2017 22:12:17 +0000 (22:12 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours am:
baf4375f01 -s ours am:
db8682996d -s ours
am:
db19657051 -s ours
Change-Id: I86ec44b3063464dae8911ab4c33f2549628dc4e7
Suprabh Shukla [Wed, 16 Aug 2017 22:11:33 +0000 (22:11 +0000)]
Disabling the activate button when paused am:
8e08a9bb71 am:
08207f457d am:
1e9af33c41 am:
1370eb3d52 am:
616c84ccb0 -s ours am:
aedf7cdfdb -s ours am:
f52c8ccbfc -s ours am:
d0275e53eb -s ours
am:
39f553782c -s ours
Change-Id: Iaa91677ee23b5b43e74ab24b50abd752be1315b7
Nick Desaulniers [Wed, 16 Aug 2017 22:10:50 +0000 (22:10 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am:
33046b4ec2 -s ours am:
f25a418e24 am:
e625c2f64e am:
4cdaebd0c4
am:
9729edbb8a
Change-Id: I0ea93e11cb5bb000aca1fe49f7201d2f70a80e5e
Maurice Lam [Wed, 16 Aug 2017 22:10:01 +0000 (22:10 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev am:
595627c630
am:
4db65eab00
Change-Id: I0d101f0c14572be3f8885e4a02dcb0119b4059ed
Suprabh Shukla [Wed, 16 Aug 2017 21:44:04 +0000 (21:44 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours am:
9a416573d7 -s ours
am:
a5e4dd2b5e -s ours
Change-Id: Ib3e70037756d54388ea19efa6ed7f17b04156cbd
Suprabh Shukla [Wed, 16 Aug 2017 21:43:05 +0000 (21:43 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours am:
8fe20711fa -s ours
am:
7b59fe50a7 -s ours
Change-Id: I977732759c2e6935e71c2dba247b2a2393352c15
jackqdyulei [Wed, 16 Aug 2017 21:34:56 +0000 (14:34 -0700)]
Update strings when shortString is true
After b/
64124535, battery strings in settings page use shortString
version. This cl updates the charging string in this situation to
match the mock.
Note that no matter whether we use shorString, the chargingLabel
should remain the same.
Bug:
64752046
Test: RunSettingsRoboTests
Change-Id: I4395d4660e212688cd560ca0b124acbd9c099cc9
Suprabh Shukla [Wed, 16 Aug 2017 21:42:10 +0000 (21:42 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours am:
bbe3047d1d -s ours
am:
832dde9768 -s ours
Change-Id: Ia03490a922bbb07832e36ced78a53b889249a647
Suprabh Shukla [Wed, 16 Aug 2017 21:38:28 +0000 (21:38 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours am:
81ba0cc873 -s ours am:
82afc6c5fd -s ours am:
23e185adf8 -s ours am:
5d4a2bb844 -s ours am:
b4678ce1d2 -s ours am:
9a416573d7 -s ours
am:
7d1286299e -s ours
Change-Id: Ic87fffce35084c46b561c0d062742d31e12bbafc
Suprabh Shukla [Wed, 16 Aug 2017 21:37:34 +0000 (21:37 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours am:
b2f5566de5 -s ours am:
05fec2162a -s ours am:
df39274478 -s ours am:
a6b4e032c8 -s ours am:
28f6dd01bc -s ours am:
8fe20711fa -s ours
am:
1b3f6d0e47 -s ours
Change-Id: I4c2572f2631dfe51747967c30b664d91685c72f0
Suprabh Shukla [Wed, 16 Aug 2017 21:36:57 +0000 (21:36 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours am:
817c35056c -s ours am:
6d7bb4c4d0 -s ours am:
3dd026d5dc -s ours am:
142433924f -s ours am:
0e22588ed0 -s ours am:
bbe3047d1d -s ours
am:
3691da8b51 -s ours
Change-Id: I4ee423a6c5aa9e3a8ec2a302c630cb344dbf034a
OSDN Git Service
