Commit Graph

14141 Commits

Author SHA1 Message Date
Fan Zhang
10ad09b658 Clean up some unnecessary inheritance.
Bug: 30681529
Change-Id: I84fa1085cc18b167d506dec3b3054d9f74d3d3e7
2016-08-16 14:53:48 -07:00
Fan Zhang
688ad857e8 Load default data warning value instead of hardcode it.
Bug: 30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92
2016-08-16 14:14:21 -07:00
Doris Ling
a36e4ca656 Merge "Fix crash in Storage app info when the corresponding app is uninstalled in the background." 2016-08-16 18:53:59 +00:00
Geoffrey Pitsch
fd351eaaf1 Only show BootSounds preference if has_boot_sounds is true.
Defaults to false, to be overridden in device values.

Bug:30888962
Change-Id: I563b15b793f1a214598bb7b5a3d9dc9cf3af0d10
2016-08-16 14:34:38 -04:00
TreeHugger Robot
dfeb34c8a8 Merge "Data Usage summary creates a dialog to change data warning level" 2016-08-16 17:36:41 +00:00
Doris Ling
6742eb39ee Merge "Fix crash when go to Data usage->Cellular data usage->Removed apps and users." 2016-08-16 17:20:58 +00:00
Matthew Fritze
9fad289ca9 Data Usage summary creates a dialog to change data warning level
Clicking the Data usage summary preference will open the same dialog
that billing cycle does to modify data warning level. The Dialog
was abstracted to be used outside of the Billing Cycle settings
fragment.

Change-Id: I70398d4656b6da4233b2bfa0da6ffa7402ead69b
Fixes: 26932938
2016-08-16 09:17:00 -07:00
Rebecca Silberstein
39f0e41ec7 TetherSettings: check provisionApp array length
Before attempting to get values from the provisionApp array, check to
make sure there are at least two elements.

BUG: 30889755
Change-Id: I42d6f8754910c12acf7bb3fbcc12e3f7be30d5e9
TEST: manually tried to open settings and it did not crash
2016-08-16 09:06:48 -07:00
TreeHugger Robot
d2c50b9fb9 Merge "Remove duplicated call to authenticationSucceeded()" 2016-08-16 13:55:39 +00:00
Robin Lee
bba4452682 Merge "Be more defensive on failure to disconnect legacy VPNs" 2016-08-16 13:27:02 +00:00
Rubin Xu
f01b60a342 Remove duplicated call to authenticationSucceeded()
Bug: 30728557
Change-Id: Ib4678f1c92b252c0afc6e71665dc8be460a20a9e
2016-08-16 12:39:19 +00: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
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
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
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
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
Adrian Roos
cea8891d5a Assist: Allow disabling the disclosure animation
am: fff9fd87bf

Change-Id: I625b96295a9f39704f2016903f4cfc063613122f
2016-08-12 20:35:30 +00: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
Lei Yu
9b74c617e9 Merge "Fix the arbitrary limit numbers and number overflow problem." 2016-08-11 23:44:16 +00:00
Adrian Roos
fff9fd87bf Assist: Allow disabling the disclosure animation
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes: 30809067
2016-08-11 15:48:13 -07: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
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
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
Geoffrey Pitsch
5faccbaa56 Boot Sounds setting in OtherSoundSettings am: 7f6d27b1ce am: 56aa7785ae
am: eaf998a65e

Change-Id: Ic9e9704c93d046f3babf76798b0a138acc1fbdc0
2016-08-09 20:04:27 +00:00
Geoffrey Pitsch
eaf998a65e Boot Sounds setting in OtherSoundSettings am: 7f6d27b1ce
am: 56aa7785ae

Change-Id: I27db7465af53db37fbd0c0e7304f56d865276892
2016-08-09 19:55:17 +00:00
Geoffrey Pitsch
56aa7785ae Boot Sounds setting in OtherSoundSettings
am: 7f6d27b1ce

Change-Id: Iae8f014dc240202a7347daa4f8c22754662d9ea2
2016-08-09 19:47:53 +00:00
Geoffrey Pitsch
7f6d27b1ce Boot Sounds setting in OtherSoundSettings
Uses a persistent system property so it can be accessed by bootanim.

BUG:30690353
Change-Id: Iffb7e140074b8bf4b0faabdecbbf163b14360655
2016-08-09 13:57:01 -04:00