OSDN Git Service
Android Build Merger (Role) [Thu, 27 Jul 2017 12:46:13 +0000 (12:46 +0000)]
Merge "Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5 am:
698ce72bc2" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 27 Jul 2017 12:45:52 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
698ce72bc2
Change-Id: I25c8649c4dbe40ccc721332b08f4a9b65332c0fd
Julia Reynolds [Thu, 27 Jul 2017 12:45:50 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
d6ab7dee09
Change-Id: Ic8517b370329586cad908283d94928f1b8c3c308
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
TreeHugger Robot [Thu, 27 Jul 2017 12:36:55 +0000 (12:36 +0000)]
Merge "Revert string change" into oc-dr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 05:44:43 +0000 (05:44 +0000)]
Merge "Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours am:
97ca7e473a -s ours" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours
am:
97ca7e473a -s ours
Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:25 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d
am:
3b30cbee7d -s ours
Change-Id: I979838abf7aa8a6b5e69bda495ca08edd6110f0d
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:58 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d
Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:56 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d -s ours
Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83
TreeHugger Robot [Thu, 27 Jul 2017 05:37:49 +0000 (05:37 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 02:15:58 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
e3e1e7b9d4 -s ours
am:
a9fc19e385 -s ours
Change-Id: Iaaa737d1fad0e56d13799452af97cd91c8266c94
Andrew Sapperstein [Thu, 27 Jul 2017 02:15:36 +0000 (02:15 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
fe35c40dad
Change-Id: I018aa267ca72d8b8c42fa6e0e39c5cc454fb4d20
Bill Yi [Thu, 27 Jul 2017 02:15:13 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
1602913a75 -s ours
Change-Id: Iad694020c5ab0c0e4105940da1cc1a0b3854c435
Matthew Fritze [Thu, 27 Jul 2017 02:14:54 +0000 (02:14 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
9092e1a0b0
Change-Id: I44bc5c7f3576eeba51913a8a852b6ecfc5f5fbd5
jackqdyulei [Thu, 27 Jul 2017 02:14:28 +0000 (02:14 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
75e89dfede
Change-Id: I718c78a47392273db4cff54abe6a2f80067f4d7e
Andrew Sapperstein [Thu, 27 Jul 2017 01:36:57 +0000 (01:36 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
1ee62c16a3
Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5
Bill Yi [Thu, 27 Jul 2017 01:36:32 +0000 (01:36 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
ef36ef28d9 -s ours
Change-Id: Iec10999409679807df916e04ca9413385c33093f
Matthew Fritze [Thu, 27 Jul 2017 01:35:04 +0000 (01:35 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
68617a6f42
Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419
Doris Ling [Thu, 27 Jul 2017 01:33:52 +0000 (01:33 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
am:
8e13218ec8
Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05
jackqdyulei [Thu, 27 Jul 2017 01:33:28 +0000 (01:33 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
063e87c689
Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
Andrew Sapperstein [Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am:
5d7fab4f22
Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef
Bill Yi [Thu, 27 Jul 2017 01:24:51 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
e3e1e7b9d4 -s ours
Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
Andrew Sapperstein [Thu, 27 Jul 2017 01:21:05 +0000 (01:21 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
Andrew Sapperstein [Thu, 27 Jul 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
Bill Yi [Thu, 27 Jul 2017 01:10:19 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
Matthew Fritze [Thu, 27 Jul 2017 01:09:55 +0000 (01:09 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]
Fix more config_headlineFontFamily-induced test breakages
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes:
64024743
Test: robotests
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am:
05185952c8 -s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
Ajay Nadathur [Wed, 26 Jul 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
044485b850
Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5
Ajay Nadathur [Wed, 26 Jul 2017 22:16:46 +0000 (22:16 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
3c308aef22
Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822
Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]
Change SwipeForNotification Payload default to Off
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
Bill Yi [Wed, 26 Jul 2017 19:47:51 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
975d9a18f1 -s ours
Change-Id: Id7b12d9714304d13c6b0fa60a4a3b2eec9b4c160
TreeHugger Robot [Wed, 26 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text
So the header won't grow/shrink when the text changes.
Bug:
64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
Doris Ling [Wed, 26 Jul 2017 18:07:19 +0000 (11:07 -0700)]
Fix gestures summary text when there is no sensor for assit.
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix:
64039312
Test: make RunSettingsRoboTests
Bill Yi [Wed, 26 Jul 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
402abcc9df -s ours
am:
bd429f42cb -s ours
Change-Id: Ia36706cecaa4a47f7c5963bbd76702b918fcf51d
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:26:06 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
402abcc9df -s ours
am:
eca6781a49 -s ours
Change-Id: I76deaa778d926e596a7da86e660c6356a1c4f704
Antony Sargent [Wed, 26 Jul 2017 17:09:14 +0000 (17:09 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am:
9fb7a3b8b4
am:
1e69f27a41
Change-Id: Iaf5a8c94d8efc7ca22b242f725a9fd94145a163b
Bill Yi [Wed, 26 Jul 2017 17:04:23 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: I8b980099381db8f56e3a339dfe497cce93595674
Bill Yi [Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Antony Sargent [Wed, 26 Jul 2017 16:19:02 +0000 (16:19 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am:
9fb7a3b8b4
am:
c3cd88c302
Change-Id: Ibeca8eb7fd61b0a730dc4c77a80a152d69eba0ca
Antony Sargent [Wed, 26 Jul 2017 16:18:50 +0000 (16:18 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
Bill Yi [Wed, 26 Jul 2017 15:07:49 +0000 (08:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Antony Sargent [Wed, 26 Jul 2017 11:12:39 +0000 (11:12 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:46:06 +0000 (08:46 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
0c3ee7c15d -s ours
am:
565664fad7 -s ours
Change-Id: I58da132af7b082860813238be8b054955629cbc9
Bill Yi [Wed, 26 Jul 2017 08:24:19 +0000 (08:24 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
0c3ee7c15d -s ours
Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5
Android Build Merger (Role) [Wed, 26 Jul 2017 08:06:55 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours am:
9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:06:37 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours
am:
9d33ddc3f7 -s ours
Change-Id: I8fb617839c8e4e691ac823301c006b2636eb0957
Bill Yi [Wed, 26 Jul 2017 08:06:35 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours
am:
a2954b3232 -s ours
Change-Id: Id6eb63a599efb450f30d5dddc0973c1936daf6df
Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f
Bill Yi [Wed, 26 Jul 2017 08:03:07 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf
Bill Yi [Wed, 26 Jul 2017 08:03:05 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88
Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: If4a3775dac048d13e739174b79415cf025bd4454
Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]
Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.
Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:
-The TestAccessPointBuilder class wasn't being found at runtime because
it was getting stripped out at build time due to not being used in
settings.
-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
asserting that we don't end up with multiple entries for the same SSID
in the access point list when changing the security state for the AP,
but it was accidentally passing multiple AP's with the same name the
first time.
Bug:
33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
Android Build Merger (Role) [Wed, 26 Jul 2017 06:38:57 +0000 (06:38 +0000)]
Merge "Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am:
0c6f001c09 am:
a65e3e6795" into oc-mr1-dev-plus-aosp
Jack He [Wed, 26 Jul 2017 06:38:40 +0000 (06:38 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am:
0c6f001c09
am:
a65e3e6795
Change-Id: I1f671e071132639a24a019909fdc6504f7bde66d
Jack He [Wed, 26 Jul 2017 06:38:32 +0000 (06:38 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am:
0c6f001c09
am:
dfc2fb14c6
Change-Id: Ifb3276adeecf756b5c2aa11ee78f1c039273cfbe
Jack He [Wed, 26 Jul 2017 06:34:30 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am:
0c6f001c09
Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a
Jack He [Wed, 26 Jul 2017 06:34:29 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am:
0c6f001c09
Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6
TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 06:27:25 +0000 (06:27 +0000)]
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a am:
3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Wed, 26 Jul 2017 06:27:07 +0000 (06:27 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a
am:
3ab3fc9ee4 -s ours
Change-Id: I4cd260bd057d9e638f4848eb41aa9cd2ae8f3c35
Doris Ling [Wed, 26 Jul 2017 06:27:06 +0000 (06:27 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am:
4906a2a38a -s ours
am:
dac62d24f4 -s ours
Change-Id: I7c5148c30ff2aca518b63790c96566158cc42697
Doris Ling [Wed, 26 Jul 2017 06:23:08 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a
Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d
Doris Ling [Wed, 26 Jul 2017 06:23:03 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am:
4906a2a38a -s ours
Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333
Fan Zhang [Wed, 26 Jul 2017 06:14:39 +0000 (06:14 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37
am:
2583cbe16b
Change-Id: Icd3ceb208f807c9e8bd447ab2ba1cac99fc466e5
TreeHugger Robot [Wed, 26 Jul 2017 06:11:07 +0000 (06:11 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 06:11:00 +0000 (06:11 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am:
5fb56c5b37
am:
43ef9743a2
Change-Id: Id6c3e260947c12d884ae76b2a8eadc4ed2dc3d73
Fan Zhang [Wed, 26 Jul 2017 06:07:37 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
Fan Zhang [Wed, 26 Jul 2017 06:07:30 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am:
5fb56c5b37
Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
Fan Zhang [Wed, 26 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 05:02:56 +0000 (05:02 +0000)]
Merge "Update misc strings" into oc-mr1-dev
am:
34d30267e3
Change-Id: I2d6e173a84ca7c58c6be4785fcd787a052839199
TreeHugger Robot [Wed, 26 Jul 2017 04:59:29 +0000 (04:59 +0000)]
Merge "Update misc strings" into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Wed, 26 Jul 2017 04:22:58 +0000 (04:22 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
am:
0224a409a9
Change-Id: I5a4a38747df864ff7dbde6e0b9185c6196012908
Doris Ling [Wed, 26 Jul 2017 04:14:07 +0000 (04:14 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:04:29 +0000 (03:04 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316
am:
be0ac89704
Change-Id: I7589fb8ca10497b81736de29a4c6461723f06a93
Christine Franks [Wed, 26 Jul 2017 02:59:16 +0000 (02:59 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am:
a7e10e0316
am:
a1f56b5faa
Change-Id: Idc0678e98f9606b991eb82c45f3c53dc65663905