OSDN Git Service
Doris Ling [Tue, 23 Aug 2016 18:29:08 +0000 (18:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am:
15c13f9e10
am:
ea445c9db7
Change-Id: I7fc61672c9df0a808c0a07723346678222c4ccf3
Doris Ling [Tue, 23 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Fix margin in Tap & pay -> Payment default. am:
9e29ac7983
am:
88842736d7
Change-Id: Ia933244f4d9bf6cf2700f1815a77bbfcf47468e0
Matthew Fritze [Tue, 23 Aug 2016 18:28:04 +0000 (18:28 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am:
88d3cb7176
am:
c9be13f26e
Change-Id: Ia249e3ea91b80d443be64c19f0a89da133a5a2c8
Matthew Fritze [Tue, 23 Aug 2016 18:27:59 +0000 (18:27 +0000)]
Stop apps with Storage Managers from launching activity when disabled am:
1051fe1e14
am:
7444ee791c
Change-Id: Ia358b60aff78a967663112399a260ffc2de27668
Salvador Martinez [Tue, 23 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am:
4c8776627b
am:
b3b0fd931b
Change-Id: Ib36fed3ad37831b957bf445e1ad116dacb49baf0
Salvador Martinez [Tue, 23 Aug 2016 18:27:52 +0000 (18:27 +0000)]
Disabled BSM mode switch when plugged in am:
d4a6768880
am:
18d58269a8
Change-Id: I3001c4e21f5e1bcae64074962ab4399f0787aaa3
Salvador Martinez [Tue, 23 Aug 2016 18:27:49 +0000 (18:27 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am:
4f6755931e
am:
a60628517f
Change-Id: Ie9a865fc1cc13a1b516d2b4a99eca84cc5adfeb7
Salvador Martinez [Tue, 23 Aug 2016 18:26:40 +0000 (18:26 +0000)]
Made dialog material design compliant am:
cfee94d448
am:
676db52b64
Change-Id: I2b5cdd12cda5b364afb1532e548b090144084a45
Salvador Martinez [Tue, 23 Aug 2016 18:26:39 +0000 (18:26 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am:
0e98c73666
am:
5817342f14
Change-Id: Id0d329a2a682e46a0168ed47f6fdba8e3163a6c9
Salvador Martinez [Tue, 23 Aug 2016 18:26:38 +0000 (18:26 +0000)]
Settings Focus prevented from moving to pref am:
41fc4e8cb7
am:
ce14c1e5eb
Change-Id: I56f870955b8bc534e21fec821404fe38c75a8e65
Salvador Martinez [Tue, 23 Aug 2016 18:26:37 +0000 (18:26 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724
am:
d31d90eecf
Change-Id: Icfc80e8e55a41cbc4039e5075cd883a5ebf6d2c8
Salvador Martinez [Tue, 23 Aug 2016 18:26:33 +0000 (18:26 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e
am:
56ebf2a051
Change-Id: I0cf475280dd390e55befd285c33cde593e8c7878
Doris Ling [Tue, 23 Aug 2016 16:07:13 +0000 (16:07 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
am:
15c13f9e10
Change-Id: I814e027259acc0b084f2b8a86bfc73ecdf453331
Doris Ling [Tue, 23 Aug 2016 16:07:10 +0000 (16:07 +0000)]
Fix margin in Tap & pay -> Payment default.
am:
9e29ac7983
Change-Id: I04ffd2ec727a87096c554ae452ed58f5c2483f1e
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
am:
88d3cb7176
Change-Id: I9c081c2f701033ba9f74c73a70fd7ea50e5cd6f5
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Stop apps with Storage Managers from launching activity when disabled
am:
1051fe1e14
Change-Id: Ib2ae9dcbd034c36c44addfaea0bc84ebe3f2247b
Salvador Martinez [Tue, 23 Aug 2016 14:43:43 +0000 (14:43 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
am:
4c8776627b
Change-Id: Ifadf14eb2f4cf46da098bad92b795dc6ff0e67e1
Salvador Martinez [Tue, 23 Aug 2016 14:43:42 +0000 (14:43 +0000)]
Disabled BSM mode switch when plugged in
am:
d4a6768880
Change-Id: I9e8116dd9413090145b7ef98b37db20706471c28
Salvador Martinez [Tue, 23 Aug 2016 14:43:41 +0000 (14:43 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
am:
4f6755931e
Change-Id: Ia60e7c612435c2215789a749231d2df78de411be
Salvador Martinez [Tue, 23 Aug 2016 14:43:40 +0000 (14:43 +0000)]
Made dialog material design compliant
am:
cfee94d448
Change-Id: If01b0f216ff0a8cadaa0d659b89a0c03136ce406
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
am:
0e98c73666
Change-Id: Iad871a4333675bde9c1c18b50f91aed6976dada8
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Settings Focus prevented from moving to pref
am:
41fc4e8cb7
Change-Id: Ifc9b53a0514830e73a06311e27acbca57b476a0d
Salvador Martinez [Tue, 23 Aug 2016 14:43:37 +0000 (14:43 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am:
89d138b724
Change-Id: I2d3d0996f4fcbfa234c46d6a7c50c84ca7517c77
Salvador Martinez [Tue, 23 Aug 2016 14:43:36 +0000 (14:43 +0000)]
Prevent wifi icon from disappearing
am:
5c0063af7e
Change-Id: I1039ce10631d7f792cae36c3a171d90df11a9e33
Doris Ling [Tue, 23 Aug 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:32:39 +0000 (22:32 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am:
5b5cf5a2c7
am:
f4ccb09603
Change-Id: I8f699fe1077e0fb120211c8b7e451d9b46da6404
Salvador Martinez [Mon, 22 Aug 2016 22:32:34 +0000 (22:32 +0000)]
Tests for launch support on default feature am:
3fb4e96b0d
am:
6c07416eba
Change-Id: I5ed71234e55ecbfbf160b860122ba73cc18d1707
Salvador Martinez [Mon, 22 Aug 2016 22:32:25 +0000 (22:32 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev am:
5bd202e277
am:
a9dc4d46ca
Change-Id: I9144185ab2a1e47364d6e8720481f3741b70f615
Salvador Martinez [Mon, 22 Aug 2016 22:32:20 +0000 (22:32 +0000)]
can open settings with support tab by default am:
12c5208ad0
am:
8d47bdc773
Change-Id: I223e42c2bc89e3f95a0fed9cc74ebfb21932370f
Lei Yu [Mon, 22 Aug 2016 22:32:19 +0000 (22:32 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am:
2363094863
am:
ffc6372e7d
Change-Id: Ib86849dbdbfd1521c0715f839aba8c2acdc6538b
jackqdyulei [Mon, 22 Aug 2016 22:32:18 +0000 (22:32 +0000)]
Make number in dialog highlighted am:
7a78213776
am:
226ccfe62f
Change-Id: Ie22cae038131a206f2d8a246ba3cd80398ba7cff
Lei Yu [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am:
dd90acf2c0
am:
69db34ed2e
Change-Id: Ifdb6298262e2c2269e83c815cd376066fb7ec4e9
jackqdyulei [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Fix the nullpointer bug in monkey test. am:
409c4708c1
am:
fbed8d95e9
Change-Id: Ia93f4051af386b8d6dee02d7c617fe75730e9fc2
TreeHugger Robot [Mon, 22 Aug 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:21:03 +0000 (22:21 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev
am:
5b5cf5a2c7
Change-Id: I7c855c5e352f57fb32a81baa891a83993fc926ca
Salvador Martinez [Mon, 22 Aug 2016 22:21:02 +0000 (22:21 +0000)]
Tests for launch support on default feature
am:
3fb4e96b0d
Change-Id: I3b3e4c1e717861856a1c5daf9d9bc9047629dae1
Salvador Martinez [Mon, 22 Aug 2016 22:20:58 +0000 (22:20 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
am:
5bd202e277
Change-Id: I0100549be28207d38ac040e8e7cd5fd5c3c1447f
Salvador Martinez [Mon, 22 Aug 2016 22:20:54 +0000 (22:20 +0000)]
can open settings with support tab by default
am:
12c5208ad0
Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b
Lei Yu [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
am:
2363094863
Change-Id: Ie93f7f491f2ccc5747963be5ba44e1e9c94fc584
jackqdyulei [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Make number in dialog highlighted
am:
7a78213776
Change-Id: I1b5fb80a2a38a1224d6aa586d1ff2065c4a2a32a
Lei Yu [Mon, 22 Aug 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
am:
dd90acf2c0
Change-Id: I61637865ac2eed318d46e568b61f8eecc03713ab
jackqdyulei [Mon, 22 Aug 2016 22:20:50 +0000 (22:20 +0000)]
Fix the nullpointer bug in monkey test.
am:
409c4708c1
Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2
Salvador Martinez [Mon, 22 Aug 2016 21:56:21 +0000 (21:56 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:56:05 +0000 (21:56 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:18 +0000 (21:55 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Fri, 29 Jul 2016 16:50:56 +0000 (09:50 -0700)]
Tests for launch support on default feature
Includes some espresso tests to ensure that the proper
tab is selected when you attempt to launch settings.
Bug:
30233920
Change-Id: I171293114bd84b064b333091fcf2394d44debed5
(cherry picked from commit
d1ef20beaa3c69e038860fd610f076892d428da2)
Lei Yu [Mon, 22 Aug 2016 21:50:29 +0000 (21:50 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:43:23 +0000 (21:43 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am:
45fd5c4d4e
am:
a5785b72bb
Change-Id: Id7383a0e5565e5b1d8544553c6fdc10d75de26cf
Fan Zhang [Mon, 22 Aug 2016 21:43:22 +0000 (21:43 +0000)]
Set oem unlock switch to reflect the actual state of device am:
1ba24ca792
am:
ede4f9d41f
Change-Id: I61f6cc2ec3dc40f27dc1ac943a2305c41a826a88
Bill Yi [Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
b98e47c79b -s ours
am:
0d15b016db -s ours
Change-Id: I0e8a0a446a27c6b1e946829a9f6b895548bdc72f
Bill Yi [Mon, 22 Aug 2016 21:42:11 +0000 (21:42 +0000)]
Import translations. DO NOT MERGE am:
f58be49ba8 -s ours
am:
4114547feb -s ours
Change-Id: Icac1aca6c6f4d09de537b606b42ae1bb1c2ce457
Fan Zhang [Mon, 22 Aug 2016 21:42:10 +0000 (21:42 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am:
5a6fad7607
am:
93c6887768
Change-Id: If1fd73e98e2f06278e71d282a55d036215e7c50b
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Have a fallback package name when matching targetPackage. am:
0c58131c37
am:
2dd0275d66
Change-Id: I4ecd52a133db924a47fcaf843a32c64227134fd8
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am:
ce8a222a59
am:
562d8276a6
Change-Id: Ie6ec75ea45b9bb94652ce649ce1e7bdf68b74135
Fan Zhang [Mon, 22 Aug 2016 21:42:07 +0000 (21:42 +0000)]
Align text to view start so they layout correctly in RTL. am:
be56fc17ed
am:
eebdb575ba
Change-Id: Ie72f4716ae0fe55b7f3fffb7f100031f5122add7
Fan Zhang [Mon, 22 Aug 2016 21:37:49 +0000 (21:37 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
am:
45fd5c4d4e
Change-Id: I6ea35fe7eb8b6b8d711b128ada6da50284896a40
Fan Zhang [Mon, 22 Aug 2016 21:37:48 +0000 (21:37 +0000)]
Set oem unlock switch to reflect the actual state of device
am:
1ba24ca792
Change-Id: I77c374d43d6f78cf57cf2a1a9bb505538d86c9aa
Bill Yi [Mon, 22 Aug 2016 21:37:47 +0000 (21:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
b98e47c79b -s ours
Change-Id: I5b2018c5885abc17a04d5e5a1bae92178cd9e854
Bill Yi [Mon, 22 Aug 2016 21:37:45 +0000 (21:37 +0000)]
Import translations. DO NOT MERGE
am:
f58be49ba8 -s ours
Change-Id: Ia9c43520ca258a2b85c47c417016f689723935ee
Fan Zhang [Mon, 22 Aug 2016 21:37:44 +0000 (21:37 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
am:
5a6fad7607
Change-Id: I227c1571ba527529af038bf805c15f8b0bc803a4
Fan Zhang [Mon, 22 Aug 2016 21:37:43 +0000 (21:37 +0000)]
Have a fallback package name when matching targetPackage.
am:
0c58131c37
Change-Id: I0c57b1a71c6388a3fdfc761b44b142abfdf40bcb
Fan Zhang [Mon, 22 Aug 2016 21:37:42 +0000 (21:37 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
am:
ce8a222a59
Change-Id: I2c8356156df5a938add968561efccdcc3affe72e
Fan Zhang [Mon, 22 Aug 2016 21:37:41 +0000 (21:37 +0000)]
Align text to view start so they layout correctly in RTL.
am:
be56fc17ed
Change-Id: I079df4d68672d97b4bb30996fb58c5a951e513f1
TreeHugger Robot [Mon, 22 Aug 2016 21:32:44 +0000 (21:32 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:23:47 +0000 (21:23 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
TreeHugger Robot [Mon, 22 Aug 2016 21:17:20 +0000 (21:17 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 20:18:30 +0000 (20:18 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev am:
95c097e835
am:
06b7346a8b
Change-Id: I86b64a4394412567a14e3cdfdc8bc9b723f1146c
Fan Zhang [Mon, 22 Aug 2016 20:18:29 +0000 (20:18 +0000)]
When click conditional's title, expand/collapse content. am:
89d7bca166
am:
c8b20343f0
Change-Id: I416b3f87bc3d5bde0396dd5ddf6cb23c43b3d155
Fan Zhang [Mon, 22 Aug 2016 20:17:01 +0000 (20:17 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
am:
95c097e835
Change-Id: I0449a66cb1ae894c6fdb8e478325ba222f84ff8d
Fan Zhang [Mon, 22 Aug 2016 20:16:59 +0000 (20:16 +0000)]
When click conditional's title, expand/collapse content.
am:
89d7bca166
Change-Id: I7ee56f661cba9e9d79399b8f01fc05cf5a70b27a
Fan Zhang [Mon, 22 Aug 2016 20:06:26 +0000 (20:06 +0000)]
Hide default phone preference when there is no phone app. am:
dc1e04035b
am:
0ae351771e
Change-Id: I8751c22c53b66b69f1a8a4d20f4997bb40316764
Fan Zhang [Mon, 22 Aug 2016 20:05:30 +0000 (20:05 +0000)]
Hide default phone preference when there is no phone app.
am:
dc1e04035b
Change-Id: I2b588c9a31f405f66c1603aacbe67798ac637dee
TreeHugger Robot [Mon, 22 Aug 2016 20:01:16 +0000 (20:01 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
Bill Yi [Mon, 22 Aug 2016 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic0668c1bf03195d38aabb92176ae6ff6d6f079d2
Auto-generated-cl: translation import
Fan Zhang [Wed, 10 Aug 2016 17:08:35 +0000 (10:08 -0700)]
Set oem unlock switch to reflect the actual state of device
Bug:
30772025
Change-Id: I143ceafb36f2f2091683b29d02ee64c07e44bb15
(cherry picked from commit
e98178bd58667b6ad756bf8a214547502185d66f)
Fan Zhang [Thu, 11 Aug 2016 22:04:15 +0000 (15:04 -0700)]
Align text to view start so they layout correctly in RTL.
Bug:
28011099
Change-Id: I65b7ab768c384a558f89e3bce539420454fed8a5
(cherry picked from commit
794de426da27b7d9bf4d93b0533d9e0ff16dc105)
Fan Zhang [Fri, 12 Aug 2016 01:37:35 +0000 (18:37 -0700)]
Have a fallback package name when matching targetPackage.
Bug:
29774397
When figuring out best match package name, we should have a fallback.
Otherwise sometimes we get empty package names, causing problems when
trying to display memory usage for each app.
Change-Id: I9cc4205098bb7c727a3063b2275fb464c8153097
(cherry picked from commit
d5ff4c42924d11c32ab591f5cef00694ce035e15)
Fan Zhang [Thu, 11 Aug 2016 23:41:29 +0000 (16:41 -0700)]
When click conditional's title, expand/collapse content.
Bug:
30200101
It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.
Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
(cherry picked from commit
a2db2ca8fad50f0fb4cdd060d83c746a857fe92a)
Fan Zhang [Mon, 15 Aug 2016 19:32:20 +0000 (12:32 -0700)]
Hide default phone preference when there is no phone app.
Bug:
29859821
Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401
(cherry picked from commit
bc6fc60683082dea6e91872e029787a0039e4cb5)
Meng Wang [Mon, 22 Aug 2016 05:01:27 +0000 (05:01 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am:
5ea4bb2f43 -s ours am:
a928b294d9 -s ours
am:
715564af48 -s ours
Change-Id: If0db222e5aff9c40dde2adf008d9ca56d3711dc7
Meng Wang [Mon, 22 Aug 2016 04:59:13 +0000 (04:59 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am:
5ea4bb2f43 -s ours
am:
a928b294d9 -s ours
Change-Id: If964580319c45956d10626b57a6e769665bb75dd
Meng Wang [Mon, 22 Aug 2016 04:46:46 +0000 (04:46 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
am:
5ea4bb2f43 -s ours
Change-Id: Iba62c6b007ad0d68d528047896dfd88961a953cd
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
Bug:
30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit
4436d6fe16c3a685b839358006183d1e8d304a33)
Matthew Fritze [Tue, 2 Aug 2016 21:39:59 +0000 (14:39 -0700)]
Stop apps with Storage Managers from launching activity when disabled
An app with a storage manager would be able to launch Manage Storage
from application settings, but when the app was disabled, the
activity would be null.
Test: In order to properly unit test this function, a large redesign is
needed in this class, and is outside the scope of this bug.
Change-Id: Ia6b78bc6761bac8b701c904a6e438bbd951b63e8
Fixes:
30457616
(cherry picked from commit
8f17fcaa1dd85c816916ffbed3f66ad80c2bbf0a)
Felipe Leme [Fri, 19 Aug 2016 23:25:20 +0000 (23:25 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev am:
4fd371d344
am:
d4fb981f73
Change-Id: I749aa6a5eaf2fdef194a3f626f9f884071186368
Felipe Leme [Fri, 19 Aug 2016 23:25:19 +0000 (23:25 +0000)]
Fixed storage calculation when SD card is adopted as internal storage. am:
454d7fcca8
am:
15ebe1fcc3
Change-Id: I67c38af3e0759501cf71e431375417388b9a2474
Roozbeh Pournader [Fri, 19 Aug 2016 23:25:18 +0000 (23:25 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev am:
a87fa8c50a
am:
d6c91cbf16
Change-Id: I0f0197f2da5ad0c8e2e07b2fa0f7b2fee0f13416
Mihai Nita [Fri, 19 Aug 2016 23:25:18 +0000 (23:25 +0000)]
Changing the languages drag handle as per the Material Design spec am:
30cf5f2615
am:
188ab9120e
Change-Id: Ic0024715605c79935bd175a89c84cd53ad602c7d
Felipe Leme [Fri, 19 Aug 2016 23:04:03 +0000 (23:04 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
am:
4fd371d344
Change-Id: Id95a997997b97006367c7180ca26cafb15435f42
Felipe Leme [Fri, 19 Aug 2016 23:04:03 +0000 (23:04 +0000)]
Fixed storage calculation when SD card is adopted as internal storage.
am:
454d7fcca8
Change-Id: I4fa4a4c489b3f65c6aab2f012d0898442dda4c2a
TreeHugger Robot [Fri, 19 Aug 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
Roozbeh Pournader [Fri, 19 Aug 2016 22:33:41 +0000 (22:33 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
am:
a87fa8c50a
Change-Id: I21b1f122846b2c89d0df2d0bf0c74ce744ab5931
Mihai Nita [Fri, 19 Aug 2016 22:33:40 +0000 (22:33 +0000)]
Changing the languages drag handle as per the Material Design spec
am:
30cf5f2615
Change-Id: I2db85b361af48cc206bef0c958561d81369bdd35
Roozbeh Pournader [Fri, 19 Aug 2016 21:36:32 +0000 (21:36 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
Doris Ling [Mon, 1 Aug 2016 18:35:03 +0000 (11:35 -0700)]
Fix margin in Tap & pay -> Payment default.
Change PaddingLeft to PaddingStart so that it also works in RTL.
Change-Id: I649a89798d95d64e0c5da6eb1decd217ef7e98c7
Fixes:
28762436
(cherry picked from commit
c51143a35ace37a8aeb3fea828dbf40f43c2b81c)
OSDN Git Service
