Fan Zhang
80fb5552d0
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53
...
am: 91becf6d87
2016-08-12 20:40:43 +00:00
Fan Zhang
96f37df6d9
Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991
...
am: d9f35ed984
2016-08-12 20:40:43 +00:00
Adrian Roos
c8131c1e58
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
...
am: 404104a6a8
2016-08-12 20:35:34 +00:00
Adrian Roos
cea8891d5a
Assist: Allow disabling the disclosure animation
...
am: fff9fd87bf
2016-08-12 20:35:30 +00:00
TreeHugger Robot
404104a6a8
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
2016-08-12 20:28:11 +00:00
Fan Zhang
91becf6d87
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
...
am: f22f7e8b53
2016-08-12 20:21:31 +00:00
Fan Zhang
d9f35ed984
Strings in a diclaimer dialog when turning on NFC.
...
am: 9c9cadd991
2016-08-12 20:21:30 +00:00
TreeHugger Robot
f22f7e8b53
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
2016-08-12 19:58:27 +00:00
TreeHugger Robot
06e2d3c886
Merge "Have a fallback package name when matching targetPackage."
2016-08-12 18:34:30 +00:00
Fan Zhang
9c9cadd991
Strings in a diclaimer dialog when turning on NFC.
...
Bug: 30834503
Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53
2016-08-12 11:29:16 -07:00
Fan Zhang
a2db2ca8fa
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
2016-08-12 10:12:18 -07:00
Fan Zhang
d5ff4c4292
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
2016-08-12 10:10:48 -07:00
jackqdyulei
c54973b8d8
Make number in dialog highlighted
...
Bug: 28787910
Change-Id: Idf6767156c0a3dafffb62b9a41ee81f6a9712a2f
2016-08-12 09:39:33 -07:00
Robin Lee
23e53b39c4
Be more defensive on failure to disconnect legacy VPNs
...
Failing to disconnect but deleting the keystore entry anyway makes
it difficult to do anything about a still-running connection.
Also switching over from prepareVpn(x,x) to prepareVpn(null,x) which
helps avoid race conditions where in between the getLegacyVpnInfo and
prepareVpn calls a 3rd-party app started a connection, which would break
the disconnect but still register as success.
Bug: 23529835
Bug: 29032008
Change-Id: Iedce784cb0eafbf75fe015dd2b3d355fcd887abf
2016-08-12 15:59:01 +00:00
Fan Zhang
794de426da
Align text to view start so they layout correctly in RTL.
...
Bug: 28011099
Change-Id: I65b7ab768c384a558f89e3bce539420454fed8a5
2016-08-12 08:45:05 -07:00
Bill Yi
d599f43a1c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e -s ours am: 7b1062da75 -s ours
...
am: a614a9c4b7
2016-08-12 09:52:12 +00:00
Bill Yi
e70ab76d85
Import translations. DO NOT MERGE am: 125aecfb4b -s ours am: e24aef7907 -s ours
...
am: 1bf4d2d8f6
2016-08-12 09:52:11 +00:00
Bill Yi
a614a9c4b7
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e -s ours
...
am: 7b1062da75
2016-08-12 09:45:35 +00:00
Bill Yi
1bf4d2d8f6
Import translations. DO NOT MERGE am: 125aecfb4b -s ours
...
am: e24aef7907
2016-08-12 09:45:33 +00:00
Bill Yi
7b1062da75
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 99b590df3e
2016-08-12 09:38:33 +00:00
Bill Yi
e24aef7907
Import translations. DO NOT MERGE
...
am: 125aecfb4b
2016-08-12 09:38:33 +00:00
TreeHugger Robot
b97812f04f
Merge "Import translations. DO NOT MERGE"
2016-08-12 09:25:51 +00:00
TreeHugger Robot
99b590df3e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-08-12 09:25:46 +00:00
Bill Yi
125aecfb4b
Import translations. DO NOT MERGE
...
Change-Id: I8eeb62c2d3038fb78118c0f2d08f94329f441be5
Auto-generated-cl: translation import
2016-08-11 18:25:13 -07:00
Bill Yi
ec90924b3a
Import translations. DO NOT MERGE
...
Change-Id: I152d531b15b6753c71aae2162f91ae4d8d4a491e
Auto-generated-cl: translation import
2016-08-11 18:20:38 -07:00
Jeremy Klein
46b1f4843f
Fix a broken TetherServiceTest. am: 8681148918 am: be9c338253
...
am: 9de1885a4d
2016-08-12 00:10:29 +00:00
Jeremy Klein
9de1885a4d
Fix a broken TetherServiceTest. am: 8681148918
...
am: be9c338253
2016-08-12 00:06:28 +00:00
Jeremy Klein
be9c338253
Fix a broken TetherServiceTest.
...
am: 8681148918
2016-08-12 00:02:57 +00:00
Lei Yu
9b74c617e9
Merge "Fix the arbitrary limit numbers and number overflow problem."
2016-08-11 23:44:16 +00:00
Jeremy Klein
8681148918
Fix a broken TetherServiceTest.
...
This should have been updated when I changed settings to use the new
tethering API.
Bug: 30814807
Change-Id: I3853e6abf1e9976aedae70d4ff41336940545b64
2016-08-11 15:57:29 -07:00
Adrian Roos
fff9fd87bf
Assist: Allow disabling the disclosure animation
...
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes: 30809067
2016-08-11 15:48:13 -07:00
Todd Kennedy
8a80c02c3b
remove duplicate permissions
...
Change-Id: Ife9dbd1a6cb57f69f66b8ffbd8d079a19e735252
2016-08-11 14:09:02 -07:00
Salvador Martinez
eec4b8edbf
Merge "Settings Focus prevented from moving to pref"
2016-08-11 17:08:26 +00:00
Salvador Martinez
0a9e62d399
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
2016-08-11 16:51:04 +00:00
TreeHugger Robot
67dce25aaa
Merge "Make notification listeners screen not crash"
2016-08-11 15:33:39 +00:00
Jason Monk
efe4c4e4e0
Make notification listeners screen not crash
...
Change-Id: I2ac94fdcaeb3c5acaab8b4ac6e6ebae1b9a7b529
2016-08-11 10:13:13 -04:00
Maurice Lam
445678f678
Merge "Remove duplicate string for fingerprint enroll"
2016-08-10 21:35:04 +00:00
TreeHugger Robot
4978082bac
Merge "Merge InstrumentedFragment & InstrumentedPerferenceFragment"
2016-08-10 21:24:26 +00:00
TreeHugger Robot
6db9a13209
Merge "Add WiFi toggle prompts - settings"
2016-08-10 21:09:01 +00:00
jackqdyulei
f69aa8e6ad
Fix the arbitrary limit numbers and number overflow problem.
...
Bug: 30560513
Change-Id: Ic36381cbf7e03d21e2ef8f9b7c76268386e5f40e
2016-08-10 13:52:10 -07:00
Fan Zhang
bf4be77f7e
Merge InstrumentedFragment & InstrumentedPerferenceFragment
...
Bug: 30642749
The 2 classes are almost identical so I'd like to just merge them if
there is no specific reason for keeping both.
Change-Id: I46af41388e25abf79066ff25bfb793cdef2e06ea
2016-08-10 12:59:24 -07:00
Maurice Lam
56093f6f4f
Remove duplicate string for fingerprint enroll
...
Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
2016-08-10 12:27:29 -07:00
Doris Ling
b9eeb53a8d
Merge "Update Jump to Camera gesture settings description text."
2016-08-10 18:59:21 +00:00
Doris Ling
5590359376
Update Jump to Camera gesture settings description text.
...
Change "double-tap" to "press twice" as action is performed on a button.
Fixes: 30766938
Change-Id: Idc2573e1aff3f7a38b1cb6740f68c0c086fa48da
2016-08-10 10:44:33 -07:00
Fan Zhang
e98178bd58
Set oem unlock switch to reflect the actual state of device
...
Bug: 30772025
Change-Id: I143ceafb36f2f2091683b29d02ee64c07e44bb15
2016-08-10 10:08:35 -07:00
Rubin Xu
3a437490be
Remove duplicated call to authenticationSucceeded()
...
Bug: 30728557
Change-Id: Ib4678f1c92b252c0afc6e71665dc8be460a20a9e
2016-08-10 10:59:57 +01:00
Matthew Fritze
28e7bc9235
Merge "Update support tab strings." into nyc-mr1-dev am: 623650c898 am: 3f89379170
...
am: 7e6a8e4cff
2016-08-09 22:45:11 +00:00
Matthew Fritze
5aea91c4b5
Update support tab strings. am: 4bb7854d04 am: 7233ce37ee
...
am: 7f385e2deb
2016-08-09 22:45:07 +00:00
Matthew Fritze
7e6a8e4cff
Merge "Update support tab strings." into nyc-mr1-dev am: 623650c898
...
am: 3f89379170
2016-08-09 22:42:41 +00:00
Matthew Fritze
7f385e2deb
Update support tab strings. am: 4bb7854d04
...
am: 7233ce37ee
2016-08-09 22:42:38 +00:00
