OSDN Git Service
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
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: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: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: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 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: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
Fan Zhang [Fri, 19 Aug 2016 19:58:49 +0000 (19:58 +0000)]
Extend conditional button width so it has more click area.
am:
e90777710c
Change-Id: I1e8575bc3ffb2ce155877ad91251d1c0239dd216
jackqdyulei [Thu, 11 Aug 2016 21:44:53 +0000 (14:44 -0700)]
Make number in dialog highlighted
Bug:
28787910
Change-Id: Idf6767156c0a3dafffb62b9a41ee81f6a9712a2f
(cherry picked from commit
c54973b8d838b97f508fd519444d954fdb30dd4f)
jackqdyulei [Thu, 11 Aug 2016 18:12:20 +0000 (11:12 -0700)]
Fix the nullpointer bug in monkey test.
Bug:
30632031
Change-Id: I295bcc804a5e847f99577353c888caa08dc8c7ef
(cherry picked from commit
a2938d2a2ff29d003b5a984e9983d854330182ef)
Salvador Martinez [Tue, 26 Jul 2016 01:16:47 +0000 (18:16 -0700)]
can open settings with support tab by default
Changes were made to the two files to allow users to provide
an argument in the intent for the settings activity. This
argument allows you to specify if you want the summary tab
or support open on startup.
Fixes:
30233920
Change-Id: I4745a0f75ea6a60a22381f5e58f2fac3836d86b9
(cherry picked from commit
2368e548e69e7331a0ea9b579cc65dd4b73b1343)
Salvador Martinez [Fri, 12 Aug 2016 17:31:43 +0000 (10:31 -0700)]
Prevent wifi icon from disappearing
Made changes to WifiSettings that customizes
the preference icon so that the icon is never
null. This greatly reduces jittering.
Bug:
29979747
Change-Id: I3d2767310513389c09a37e34674a304278f4d0de
(cherry picked from commit
47568de0037401f1f5c1d17231f9198b16c8872e)
Salvador Martinez [Mon, 8 Aug 2016 18:06:37 +0000 (11:06 -0700)]
Settings Focus prevented from moving to pref
RecyclerView containing preferences for support
tab and summary tab are no longer focusable
so that focus is not taken by preferences when
loaded.
Bug:
30214948
Change-Id: I23e717c58b1104fd0d2f8d89b77715a7b1fbc922
(cherry picked from commit
0a9e62d3998a5bcb57c4d0390378a5cddcad5250)
Salvador Martinez [Mon, 15 Aug 2016 23:59:30 +0000 (16:59 -0700)]
Made dialog material design compliant
modified layout file to get the correct
padding and layout as described in the material
design documents.
Bug:
30709085
Change-Id: I18edf220a62228872793fb5b655b02751f38e1f5
(cherry picked from commit
cdb0f56db8332215cdf52b00169a7e34cb8dbee5)
Salvador Martinez [Mon, 8 Aug 2016 18:06:37 +0000 (11:06 -0700)]
Disabled BSM mode switch when plugged in
Battery Saver mode can no longer be toggled
when the device is plugged in. Additionaly,
A content description was added to the switch
so that talkback says something when it is single
tapped.
Bug:
30083279
Change-Id: Id901598dbe13c443cae0b32769a2e3ef50428c08
(cherry picked from commit
b9ab480a29205714d34de8f66d67f55a49ff04ba)
Fan Zhang [Tue, 16 Aug 2016 01:31:55 +0000 (18:31 -0700)]
Extend conditional button width so it has more click area.
Bug:
30822058
Change-Id: I88a88c7807309741113e4b5557686c08261eb5d0
(cherry picked from commit
40b56b4c15f3b5e6984902d0fe267494dbe8ead2)
Bill Yi [Fri, 19 Aug 2016 16:11:07 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE
am:
1339fe799d -s ours
Change-Id: Ide032ff6bbdfdb0f73e045135f80a3d1f75f338e
Bill Yi [Fri, 19 Aug 2016 14:39:53 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0efafca736424685e687ac6f08884fdc5e69e88d
Auto-generated-cl: translation import
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
am:
f30ef19dc3
Change-Id: Ibe2e2a5a6d5188ae4aa42195884caa5b0ad7853b
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
WiFiCallingSettings: hide wfc mode preference if not editable
am:
4436d6fe16
Change-Id: Ica966b8306afd541521b0e7f65c68019f4c692b4
TreeHugger Robot [Thu, 18 Aug 2016 21:59:16 +0000 (21:59 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 21:57:51 +0000 (21:57 +0000)]
Do not allow apps to cause Bluetooth to be discoverable forever
am:
6dcab67c0c
Change-Id: Ifaef229a60b74bb2708159232fe8f6792ded7647
Ajay Panicker [Thu, 18 Aug 2016 20:17:19 +0000 (13:17 -0700)]
Do not allow apps to cause Bluetooth to be discoverable forever
Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.
Bug:
28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
WiFiCallingSettings: hide wfc mode preference if not editable
Bug:
30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
Julia Reynolds [Wed, 17 Aug 2016 18:11:44 +0000 (18:11 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev
am:
8d9ade8b9c
Change-Id: I2fc4c10d0fae744749a7c92aa0c39681e1c9861c
Julia Reynolds [Wed, 17 Aug 2016 18:11:43 +0000 (18:11 +0000)]
Display days of week in locale order.
am:
0bb60ada96
Change-Id: I9c6cb0b0947d8d313fa5794185fbe119cfa7725a
Fan Zhang [Wed, 17 Aug 2016 17:39:24 +0000 (17:39 +0000)]
Load default data warning value instead of hardcode it.
am:
688ad857e8
Change-Id: Ie982559572c96da6ba0bb9276f4ba974936b418f
Bill Yi [Wed, 17 Aug 2016 17:39:22 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE
am:
8a611b1162 -s ours
Change-Id: I69399deba5bc5fd85d06923cacc07fb1128f6eec
Julia Reynolds [Wed, 17 Aug 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev
Fan Zhang [Tue, 9 Aug 2016 23:27:54 +0000 (16:27 -0700)]
Load default data warning value instead of hardcode it.
Bug:
30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92
Bill Yi [Tue, 16 Aug 2016 09:31:55 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib98e5307dd77c0295e16e465c0f12d362749ea4b
Auto-generated-cl: translation import
Fan Zhang [Mon, 15 Aug 2016 23:40:39 +0000 (23:40 +0000)]
Don't dial any number if DIAL intent is not supported.
am:
6098913d4b
Change-Id: Ia00c08773bb69508f274739043b6c0b00015358e
Felipe Leme [Mon, 8 Aug 2016 18:04:30 +0000 (11:04 -0700)]
Fixed storage calculation when SD card is adopted as internal storage.
A SD Card can be set as internal storage, in which case its total must
be added to the total internal storage size.
Prior to this change, the total internal storage size was hardcoded as
the value returned by Storage Manager.
Also fixed the storage summary total to exclude portable devices.
** Cherrypick of
c53410c41148a3882673ba1a3d95dd050649ea2a **
Fixes:
30689428
BUG:
30742322
Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9
Fan Zhang [Mon, 15 Aug 2016 20:22:42 +0000 (13:22 -0700)]
Don't dial any number if DIAL intent is not supported.
Bug:
30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209
Adrian Roos [Fri, 12 Aug 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
am:
404104a6a8
Change-Id: I0254b84dac2b1cb3fa7a07e74218bf8cc30ff59b
Adrian Roos [Fri, 12 Aug 2016 20:35:30 +0000 (20:35 +0000)]
Assist: Allow disabling the disclosure animation
am:
fff9fd87bf
Change-Id: I625b96295a9f39704f2016903f4cfc063613122f
TreeHugger Robot [Fri, 12 Aug 2016 20:28:10 +0000 (20:28 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
Fan Zhang [Fri, 12 Aug 2016 20:21:31 +0000 (20:21 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
am:
f22f7e8b53
Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514
Fan Zhang [Fri, 12 Aug 2016 20:21:30 +0000 (20:21 +0000)]
Strings in a diclaimer dialog when turning on NFC.
am:
9c9cadd991
Change-Id: Ic71699bbc33fca59c29abd8c7e3804975ceca9db
TreeHugger Robot [Fri, 12 Aug 2016 19:58:26 +0000 (19:58 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
Fan Zhang [Fri, 12 Aug 2016 17:44:23 +0000 (10:44 -0700)]
Strings in a diclaimer dialog when turning on NFC.
Bug:
30834503
Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53
Bill Yi [Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
99b590df3e -s ours
Change-Id: If09ddaa056c14936d86b11a369a7a2a31025f057
Bill Yi [Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)]
Import translations. DO NOT MERGE
am:
125aecfb4b -s ours
Change-Id: Ic8503c8f4b0b05582c1ad5f12e0e5123b2ea5c41
TreeHugger Robot [Fri, 12 Aug 2016 09:25:46 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 01:25:13 +0000 (18:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8eeb62c2d3038fb78118c0f2d08f94329f441be5
Auto-generated-cl: translation import
Jeremy Klein [Fri, 12 Aug 2016 00:02:57 +0000 (00:02 +0000)]
Fix a broken TetherServiceTest.
am:
8681148918
Change-Id: Ie8a290129fd32b6630273a29cd6f77425e6c419d
Jeremy Klein [Thu, 11 Aug 2016 22:57:29 +0000 (15:57 -0700)]
Fix a broken TetherServiceTest.
This should have been updated when I changed settings to use the new
tethering API.
Bug:
30814807
Change-Id: I3853e6abf1e9976aedae70d4ff41336940545b64
Adrian Roos [Thu, 11 Aug 2016 22:45:22 +0000 (15:45 -0700)]
Assist: Allow disabling the disclosure animation
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes:
30809067
Matthew Fritze [Tue, 9 Aug 2016 22:38:50 +0000 (22:38 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev
am:
623650c898
Change-Id: I492f8c7d386c7a90455d48ffa18ad00bebd9ffa8
Matthew Fritze [Tue, 9 Aug 2016 22:38:49 +0000 (22:38 +0000)]
Update support tab strings.
am:
4bb7854d04
Change-Id: Iac65f5356686c450a2b20db151fb39496b6a89ba
Matthew Fritze [Tue, 9 Aug 2016 22:35:26 +0000 (22:35 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev
OSDN Git Service
