OSDN Git Service
Salvador Martinez [Wed, 24 Aug 2016 18:07:37 +0000 (11:07 -0700)]
Updated Nexus imprint screen
The fingerprint settings screen looked ugly so an
icon was added and the styles used in the
preferences normalized so everything lines up
and is flush now.
Test: Visually Inspect
Bug:
27834731
Change-Id: I208d7fc2aecbe64d3a0b771fc73f49c9612f6efa
Salvador Martinez [Tue, 23 Aug 2016 20:06:53 +0000 (20:06 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724 am:
d31d90eecf
am:
2279920944
Change-Id: Iccb6ae0dd0b8d584fd0c1121b7bb91bcbbd235e8
Salvador Martinez [Tue, 23 Aug 2016 20:06:49 +0000 (20:06 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e am:
56ebf2a051
am:
5bbfa0555a
Change-Id: Ic365caef2c120220ae7ec13e576ae589017bc545
TreeHugger Robot [Tue, 23 Aug 2016 18:37:45 +0000 (18:37 +0000)]
Merge "Force phone number display to be LTR in support tab."
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
Fan Zhang [Tue, 23 Aug 2016 16:18:13 +0000 (09:18 -0700)]
Force phone number display to be LTR in support tab.
Bug:
31030062
Change-Id: I94272c0ecbfa2f96842838c0f590b3704cd5c020
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
Salvador Martinez [Tue, 23 Aug 2016 02:08:46 +0000 (02:08 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am:
5b5cf5a2c7 am:
f4ccb09603
am:
26fd0d0b75
Change-Id: I818e179bd0c3d3a75382b668c296f41f3d179a8e
Fan Zhang [Tue, 23 Aug 2016 00:26:34 +0000 (17:26 -0700)]
resolve merge conflicts of
111b81d to master
Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d
TreeHugger Robot [Mon, 22 Aug 2016 23:05:42 +0000 (23:05 +0000)]
Merge "Force searchview to stretch entire actionbar."
Lei Yu [Mon, 22 Aug 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am:
2363094863 am:
ffc6372e7d
am:
2edf494de8
Change-Id: I3ab17d11b0540d6465726911c276667e19f20733
jackqdyulei [Mon, 22 Aug 2016 22:38:51 +0000 (22:38 +0000)]
Make number in dialog highlighted am:
7a78213776 am:
226ccfe62f
am:
8d4a7021dd
Change-Id: I04d18f0f33135a24f0638edd0f0b5547c8ed7fe6
Lei Yu [Mon, 22 Aug 2016 22:38:47 +0000 (22:38 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am:
dd90acf2c0 am:
69db34ed2e
am:
6ad307140a
Change-Id: Ieef6eb6ef4f51cd9084738a80b2d021735ce9a86
jackqdyulei [Mon, 22 Aug 2016 22:38:46 +0000 (22:38 +0000)]
Fix the nullpointer bug in monkey test. am:
409c4708c1 am:
fbed8d95e9
am:
83c6cfa463
Change-Id: I1b75233d06a534bc6f439649f460769b37ec5953
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
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: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:47:29 +0000 (21:47 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am:
45fd5c4d4e am:
a5785b72bb
am:
d1a229ab52
Change-Id: I3fb9871a6ede2d592e40ce27136d50be396137c9
Fan Zhang [Mon, 22 Aug 2016 21:47:28 +0000 (21:47 +0000)]
Set oem unlock switch to reflect the actual state of device am:
1ba24ca792 am:
ede4f9d41f
am:
7f881f339b
Change-Id: Ib51d2cf1ff484f16747762645e7c62006d2b574a
Bill Yi [Mon, 22 Aug 2016 21:47:28 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
b98e47c79b -s ours am:
0d15b016db -s ours
am:
2b094c4676 -s ours
Change-Id: Icff6987f0c89fe3fa6d25639997c7878799cc2c3
Bill Yi [Mon, 22 Aug 2016 21:46:15 +0000 (21:46 +0000)]
Import translations. DO NOT MERGE am:
f58be49ba8 -s ours am:
4114547feb -s ours
am:
d0e262ba32 -s ours
Change-Id: Iad5870352bd0f497cfe619b2971190af6e0d0f30
Fan Zhang [Mon, 22 Aug 2016 21:46:15 +0000 (21:46 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am:
5a6fad7607 am:
93c6887768
am:
c7065ca903
Change-Id: I9c61e2cfb396c86c45802e94b55ddb9772b9cf5a
Fan Zhang [Mon, 22 Aug 2016 21:46:14 +0000 (21:46 +0000)]
Have a fallback package name when matching targetPackage. am:
0c58131c37 am:
2dd0275d66
am:
136fe5468c
Change-Id: I1993abbc9f3718dbec52f4e66e9bab0797945a64
Fan Zhang [Mon, 22 Aug 2016 21:46:14 +0000 (21:46 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am:
ce8a222a59 am:
562d8276a6
am:
ac38260bbb
Change-Id: I1992804517bfd96aad9efafedff1e75f52d940d2
Fan Zhang [Mon, 22 Aug 2016 21:46:13 +0000 (21:46 +0000)]
Align text to view start so they layout correctly in RTL. am:
be56fc17ed am:
eebdb575ba
am:
44f03854d8
Change-Id: I4c9a5b25f17fd34bd9d2ad684cb3348d3f398363
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
TreeHugger Robot [Mon, 22 Aug 2016 21:41:00 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Daniel Nishi [Mon, 22 Aug 2016 21:05:34 +0000 (21:05 +0000)]
Merge "Remove unnecessary build flag from Robotests make."
Fan Zhang [Mon, 22 Aug 2016 20:59:59 +0000 (13:59 -0700)]
Force searchview to stretch entire actionbar.
Bug:
30747805
Change-Id: If702ab934dbed6ee329b87dde565c1e381136849
Fan Zhang [Mon, 22 Aug 2016 20:23:02 +0000 (20:23 +0000)]
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev am:
95c097e835 am:
06b7346a8b
am:
672b84526f
Change-Id: I8bd0c6c6a270114e71acbfe7d7e082c6c2896ccf
Fan Zhang [Mon, 22 Aug 2016 20:23:02 +0000 (20:23 +0000)]
When click conditional's title, expand/collapse content. am:
89d7bca166 am:
c8b20343f0
am:
29e1c59f32
Change-Id: I4799fcfaa967e9bde4ca7533eb9e5ca7a1db8718
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:10:31 +0000 (20:10 +0000)]
Hide default phone preference when there is no phone app. am:
dc1e04035b am:
0ae351771e
am:
7804d47be3
Change-Id: Ie73c4ac0584b2a1b0754f46dbbc83cb5a7918120
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
Bill Yi [Mon, 22 Aug 2016 19:52:21 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib8bfb0dd6781ff115d6723a94a13dfe342361668
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)
Daniel Nishi [Mon, 22 Aug 2016 19:25:08 +0000 (12:25 -0700)]
Remove unnecessary build flag from Robotests make.
Change-Id: Icd2a06ad7f5dbcf1913d16a5513765c6b2fdbf9f
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:05:32 +0000 (05:05 +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
am:
951e558bdf -s ours
Change-Id: Ie3bdbe267a596a8c502ad0f50ded1ef556389130
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)
Felipe Leme [Fri, 19 Aug 2016 23:55:59 +0000 (23:55 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev am:
4fd371d344 am:
d4fb981f73
am:
226bb59c27
Change-Id: Ia6c4d8a00a4c01ab4adab5ae7ce2ba04e2fa76a2
Felipe Leme [Fri, 19 Aug 2016 23:55:57 +0000 (23:55 +0000)]
Fixed storage calculation when SD card is adopted as internal storage. am:
454d7fcca8 am:
15ebe1fcc3
am:
654312fa6a
Change-Id: I04a6da3cd4f3b4a37a19b5cfd21fdb63bfba099a
Roozbeh Pournader [Fri, 19 Aug 2016 23:55:56 +0000 (23:55 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev am:
a87fa8c50a am:
d6c91cbf16
am:
c6f4da6974
Change-Id: I50ef400b3225d22643fa823a5b15f5138bd20b25
Mihai Nita [Fri, 19 Aug 2016 23:55:55 +0000 (23:55 +0000)]
Changing the languages drag handle as per the Material Design spec am:
30cf5f2615 am:
188ab9120e
am:
0a180b239e
Change-Id: I4c3a5bbc8d834f60499fe213ab722b2e6229f1a6
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
OSDN Git Service
