Commit Graph

30689 Commits

Author SHA1 Message Date
Rubin Xu
f01b60a342 Remove duplicated call to authenticationSucceeded()
Bug: 30728557
Change-Id: Ib4678f1c92b252c0afc6e71665dc8be460a20a9e
2016-08-16 12:39:19 +00:00
Bill Yi
8a611b1162 Import translations. DO NOT MERGE
Change-Id: Ib98e5307dd77c0295e16e465c0f12d362749ea4b
Auto-generated-cl: translation import
2016-08-16 02:31:55 -07:00
Bill Yi
d37cd406a3 Import translations. DO NOT MERGE
Change-Id: I547436dbdb35ff59ff73b83be6c92bfa3bd00bf0
Auto-generated-cl: translation import
2016-08-16 02:26:59 -07:00
TreeHugger Robot
ca32532bc9 Merge "Made dialog material design compliant" 2016-08-16 02:02:34 +00:00
Fan Zhang
40b56b4c15 Extend conditional button width so it has more click area.
Bug: 30822058
Change-Id: I88a88c7807309741113e4b5557686c08261eb5d0
2016-08-15 18:33:02 -07:00
Doris Ling
645aecde27 Fix crash when go to Data usage->Cellular data usage->Removed apps and
users.

Ensure that the user info is not null before using it to retrieve user
icon and label. If the user info is null, use the default label.

Change-Id: If402844d472a15f04c812f20c1c761b3a189a638
Fixes: 29619032
2016-08-15 18:27:55 -07:00
TreeHugger Robot
0b15a227fc Merge "Fixed storage calculation when SD card is adopted as internal storage." 2016-08-16 00:54:09 +00:00
Salvador Martinez
cdb0f56db8 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
2016-08-15 17:34:06 -07:00
Fan Zhang
0436ed7620 Merge "Hide default phone preference when there is no phone app." 2016-08-16 00:32:28 +00:00
Fan Zhang
e162cbbd69 Don't dial any number if DIAL intent is not supported. am: 6098913d4b am: 9d478bef16
am: 67a496221e

Change-Id: I3a92f89fe4e2dc527c994050556253ec834ca1e6
2016-08-15 23:48:34 +00:00
Fan Zhang
67a496221e Don't dial any number if DIAL intent is not supported. am: 6098913d4b
am: 9d478bef16

Change-Id: I6726f4551a1ca865c225d2c6d2bfb0b1e6a4f00a
2016-08-15 23:44:32 +00:00
Fan Zhang
9d478bef16 Don't dial any number if DIAL intent is not supported.
am: 6098913d4b

Change-Id: Ia00c08773bb69508f274739043b6c0b00015358e
2016-08-15 23:40:39 +00:00
Felipe Leme
454d7fcca8 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 c53410c411 **

Fixes: 30689428
BUG: 30742322

Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9
2016-08-15 23:35:53 +00:00
Felipe Leme
c53410c411 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.

Fixes: 30689428
BUG: 30742322

Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9
2016-08-15 16:32:54 -07:00
Fan Zhang
6098913d4b Don't dial any number if DIAL intent is not supported.
Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209
2016-08-15 13:24:18 -07:00
Lei Yu
b23a7c4c8e Merge "Fix the nullpointer bug in monkey test." 2016-08-15 19:58:58 +00:00
Fan Zhang
bc6fc60683 Hide default phone preference when there is no phone app.
Bug: 29859821
Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401
2016-08-15 12:48:04 -07:00
TreeHugger Robot
95d55fc687 Merge "Tests for launch support on default feature" 2016-08-15 19:42:55 +00:00
Salvador Martinez
d1ef20beaa 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
2016-08-15 10:34:11 -07:00
Salvador Martinez
47568de003 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
2016-08-15 10:24:59 -07:00
Tony Mantler
c2d8110a86 Fix Wifi screen updating
Fixes keyboard focus being cleared, and allows animation

b/30759327

Change-Id: If820708a292ef8dfa173d9edc04bbab322ee78d9
2016-08-15 09:45:57 -07:00
Andre Lago
3e398c87f2 [Settings] Set different ringtones at work profile
Updated the Settings app to allow setting different default system
ringtones for work profile apps

Bug: 30658854
Change-Id: I7461be070bd4e8d86bf1fd724039e53d500094ad
2016-08-15 11:11:56 +01:00
Adrian Roos
78589d8e41 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8 am: c8131c1e58
am: 20fe8b32b8

Change-Id: I9c30ec82bab149805891157df27bd4f66a5aff6c
2016-08-14 00:32:25 +00:00
Lei Yu
358bd0dab1 Merge "Make number in dialog highlighted" 2016-08-13 16:28:16 +00:00
Adrian Roos
cbd67e87de resolve merge conflicts of 523ec54 to master
Change-Id: I2f31db207be03a01be7786a0c93abdbb6b84fbf6
2016-08-12 18:05:57 -07:00
TreeHugger Robot
e0b740865f Merge "When click conditional's title, expand/collapse content." 2016-08-12 23:50:39 +00:00
Adrian Roos
20fe8b32b8 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8
am: c8131c1e58

Change-Id: I35103df353bf82d27dec8a579f459ec1201247cd
2016-08-12 23:18:40 +00:00
Adrian Roos
523ec5476d Assist: Allow disabling the disclosure animation am: fff9fd87bf
am: cea8891d5a

Change-Id: Ib18f9a866942cc40752b7ff36d2cd6a2aa6e7084
2016-08-12 23:18:32 +00:00
Doris Ling
36e953fbe5 Fix crash in Storage app info when the corresponding app is uninstalled
in the background.

1. Move the handling for package removal from InstalledAppDetails to
AppInfoBase so that all app info subclass will now finish
correspondingly if the package is uninstalled.
2. In InstalledAppDetails, when handling package removal, will also
finish the app info fragment that it starts earlier.

Change-Id: Id741e7475414045040dd0797ff3bc63ac214f400
Fixes: 27774473
2016-08-12 15:25:00 -07:00
jackqdyulei
a2938d2a2f Fix the nullpointer bug in monkey test.
Bug: 30632031

Change-Id: I295bcc804a5e847f99577353c888caa08dc8c7ef
2016-08-12 14:44:04 -07:00
Fan Zhang
2d150acda2 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53 am: 91becf6d87
am: 80fb5552d0

Change-Id: I25d90afb3df6796a89f286e86b92db18148f32ba
2016-08-12 21:14:32 +00:00
Fan Zhang
26bc658a6f Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991 am: d9f35ed984
am: 96f37df6d9

Change-Id: I863f523633a9c3e5968aeb78f0239ea40db97718
2016-08-12 21:14:32 +00:00
Fan Zhang
80fb5552d0 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53
am: 91becf6d87

Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968
2016-08-12 20:40:43 +00:00
Fan Zhang
96f37df6d9 Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991
am: d9f35ed984

Change-Id: Id5e8ed6bc0398d97e7ca662c1c9bf173a3159a7f
2016-08-12 20:40:43 +00:00
Adrian Roos
c8131c1e58 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
am: 404104a6a8

Change-Id: I0254b84dac2b1cb3fa7a07e74218bf8cc30ff59b
2016-08-12 20:35:34 +00:00
Adrian Roos
cea8891d5a Assist: Allow disabling the disclosure animation
am: fff9fd87bf

Change-Id: I625b96295a9f39704f2016903f4cfc063613122f
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

Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514
2016-08-12 20:21:31 +00:00
Fan Zhang
d9f35ed984 Strings in a diclaimer dialog when turning on NFC.
am: 9c9cadd991

Change-Id: Ic71699bbc33fca59c29abd8c7e3804975ceca9db
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  -s ours

Change-Id: I10a788b2cff1a56389a32d6c3a07d5fa6abc4f2a
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  -s ours

Change-Id: Ic1e906941ec5062d75472e80fe75fb057d5fb52d
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  -s ours

Change-Id: I64e1747122165a22613ec976e8a3d9d713da41d6
2016-08-12 09:45:35 +00:00