Commit Graph

30011 Commits

Author SHA1 Message Date
Lorenzo Colitti
e4d8284000 Support displaying a dialog when Wi-Fi loses Internet access. am: 1449ecd460 am: a4aa79bb69
am: 0e92ddbc1b

Change-Id: I346f3b3267c3108db8fec585a0d0b7c54934b37e
2016-09-15 16:17:02 +00:00
Lorenzo Colitti
0e92ddbc1b Support displaying a dialog when Wi-Fi loses Internet access. am: 1449ecd460
am: a4aa79bb69

Change-Id: I2558b419cdb5897ed8b3cd2c36c52411eab48936
2016-09-15 16:10:46 +00:00
Lorenzo Colitti
a4aa79bb69 Support displaying a dialog when Wi-Fi loses Internet access.
am: 1449ecd460

Change-Id: I835eeb9165e726e20c26c47fb4e20fbd6d9e3f5a
2016-09-15 16:05:53 +00:00
Lorenzo Colitti
4753ad5902 Fix unintended modification of the NO_INTERNET dialog.
Bug: 31075769
Change-Id: I655725121aed164c2e270a6fe2ffec78a87897bd
2016-09-16 00:41:50 +09:00
Lorenzo Colitti
1449ecd460 Support displaying a dialog when Wi-Fi loses Internet access.
Bug: 31075769
Change-Id: Ia0c76d80591937dc40765c437e5779f3b6dde217
2016-09-15 23:43:00 +09:00
Salvador Martinez
c5f2ba0a42 Merge "Changed information string about model" into nyc-mr1-dev am: d1f38f302e
am: 4e30b0458a

Change-Id: I12c1a89caf5ece1e179297f581f5e2d73439bd96
2016-09-14 20:41:04 +00:00
Salvador Martinez
a3123c3f2f Changed information string about model am: d92ce3ef0c
am: 878bb1e602

Change-Id: I819151689726d9f04116fe5fae7f1160dda5df2b
2016-09-14 20:41:04 +00:00
Salvador Martinez
4e30b0458a Merge "Changed information string about model" into nyc-mr1-dev
am: d1f38f302e

Change-Id: I4803e43fe8369a266c19a58e2955548581c15348
2016-09-14 20:38:04 +00:00
Salvador Martinez
878bb1e602 Changed information string about model
am: d92ce3ef0c

Change-Id: Ia6bd630c8e273eb3613dcb5c597bd89e6de17454
2016-09-14 20:38:03 +00:00
TreeHugger Robot
d1f38f302e Merge "Changed information string about model" into nyc-mr1-dev 2016-09-14 20:27:54 +00:00
Amin Shaikh
e57a428d5d Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am: 1c0601b046
am: 438167c61d

Change-Id: Ibcd25fa3e77f870e32eefc291e3ddb6ea698d459
2016-09-14 19:13:58 +00:00
Amin Shaikh
691313cad3 Fix crash when tapping on "Change Wallpaper". am: f7610f0f45
am: 20022a957d

Change-Id: Iffd960c32ef2100b525d1cc276e883ffa2b0648a
2016-09-14 19:13:57 +00:00
Amin Shaikh
438167c61d Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
am: 1c0601b046

Change-Id: I307d81f183ebfcc9bb1308382d8fbf357a0e6479
2016-09-14 19:11:27 +00:00
Amin Shaikh
20022a957d Fix crash when tapping on "Change Wallpaper".
am: f7610f0f45

Change-Id: I0d321cc94af45bea0dd1dfaa82df21c4b95a8456
2016-09-14 19:11:26 +00:00
Amin Shaikh
1c0601b046 Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev 2016-09-14 18:52:54 +00:00
Salvador Martinez
d92ce3ef0c Changed information string about model
The string which contained the device
model information in settings was changed
to be more general. That way the model
information provided by the phone can be
more than just a number.

Test: Manual Inspection
Bug: 31108285
Change-Id: I7caf0a874983579b0e74240661b0d9b4df68bd74
2016-09-14 11:31:43 -07:00
Fan Zhang
d9c67614de Merge "Add ability to disable data warning." into nyc-mr1-dev am: 7b7e6260f8
am: 2c9e50ed26

Change-Id: I1a612a4736e21c17eb61778f8e02c360421f19e8
2016-09-14 17:55:50 +00:00
Fan Zhang
2c9e50ed26 Merge "Add ability to disable data warning." into nyc-mr1-dev
am: 7b7e6260f8

Change-Id: Ie6bba0ec915035e28005b12ee6ff21285734d864
2016-09-14 17:35:43 +00:00
Fan Zhang
0ee60c068a Add ability to disable data warning. am: 7bd19b8891
am: 7c7a101a98

Change-Id: Ie752bc73c9034402efc478a0b1631ad7aec3934c
2016-09-14 17:35:12 +00:00
Rubin Xu
d1ba5538e0 Show approprate text when enrolling fingerprint am: ae093e2428
am: 307767380a

Change-Id: I5cd78f269d54b0c208ccebcce686ad0e73dabf65
2016-09-14 17:32:21 +00:00
Fan Zhang
7c7a101a98 Add ability to disable data warning.
am: 7bd19b8891

Change-Id: Ibde5eb39a32e836c2ae30f036998d19523efcd9b
2016-09-14 17:29:32 +00:00
Rubin Xu
307767380a Show approprate text when enrolling fingerprint
am: ae093e2428

Change-Id: I536e3bafd65461038544e6f24e35bac902d768bc
2016-09-14 17:29:00 +00:00
TreeHugger Robot
7b7e6260f8 Merge "Add ability to disable data warning." into nyc-mr1-dev 2016-09-14 16:24:19 +00:00
Fan Zhang
7bd19b8891 Add ability to disable data warning.
- Add a preference to disable data warning.
- Disable data usage chart in summary page when data warning is turned
  off.

Bug: 26934313
Test: Manually turned on/off data warning and inspected UI.
Test: ag/1440361

Change-Id: I6d5b86b8502647781c52cf940f276e1969251b59
2016-09-14 09:22:43 -07:00
Rubin Xu
ae093e2428 Show approprate text when enrolling fingerprint
Inform the user that unlocking device by fingerprint is disabled if the
device admin has disallowed it.

Bug: 27201226
Change-Id: Id1694f07a9421ebfe3c777f2a6b624a836bff2d5
2016-09-14 13:53:03 +01:00
Amin Shaikh
f7610f0f45 Fix crash when tapping on "Change Wallpaper".
Bug: 31306517
Change-Id: I896311917d4954f78dd689bd1a40b03e7f94284e
2016-09-13 22:52:15 -07:00
Fan Zhang
3be1e1a404 Merge "Add string for set data warning." into nyc-mr1-dev am: c88805713d
am: b33ad1419a

Change-Id: Ifc74efafce9fb002265d1099977f473a7af50171
2016-09-13 23:25:14 +00:00
Fan Zhang
6ba8fdff89 Add string for set data warning. am: d10686ff4f
am: 5a0ab072f0

Change-Id: I847b02df7c58f33bff865c7d419b168c5325d155
2016-09-13 23:25:13 +00:00
Fan Zhang
b33ad1419a Merge "Add string for set data warning." into nyc-mr1-dev
am: c88805713d

Change-Id: I7f1efdeb01c4cbe2c74290411b658c6efc997c8f
2016-09-13 23:22:11 +00:00
Fan Zhang
5a0ab072f0 Add string for set data warning.
am: d10686ff4f

Change-Id: I6b923a13339955e8c5a22da4258390e0a85ad2b5
2016-09-13 23:22:10 +00:00
TreeHugger Robot
c88805713d Merge "Add string for set data warning." into nyc-mr1-dev 2016-09-13 23:19:46 +00:00
Matthew Fritze
f3dc6b1aab Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev am: b5807e199f
am: 6a2c42f745

Change-Id: I966cbe26ee6e2748418ec1eae1b5987d7fe2b30a
2016-09-13 23:16:55 +00:00
Matthew Fritze
a04bf124e6 Prevent Data Usage Settings crash on phones without cellular history am: 10d7e4c060
am: d7b12c8180

Change-Id: I7353ad43ddce8d37dfdda8e13e1d5b5df7aecfa0
2016-09-13 23:16:48 +00:00
Matthew Fritze
e6431c79c7 Data Usage summary creates a dialog to change data warning level am: 25437d7c61
am: 68e8770d17

Change-Id: I0524bddab4a490ed30fdbff5b5a42d7e9d95b686
2016-09-13 23:16:42 +00:00
Matthew Fritze
6a2c42f745 Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev
am: b5807e199f

Change-Id: I22600ded34079ba796b8e124b75a9d6f7799653d
2016-09-13 23:13:47 +00:00
Matthew Fritze
d7b12c8180 Prevent Data Usage Settings crash on phones without cellular history
am: 10d7e4c060

Change-Id: Ic6bcdd378ab19a70dee11e7fc352cd54903309bd
2016-09-13 23:13:46 +00:00
Matthew Fritze
68e8770d17 Data Usage summary creates a dialog to change data warning level
am: 25437d7c61

Change-Id: I7a5be447ccbff41c4114f2a8146c8432f8dbf896
2016-09-13 23:13:41 +00:00
Matthew Fritze
b5807e199f Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev
* changes:
  Prevent Data Usage Settings crash on phones without cellular history
  Data Usage summary creates a dialog to change data warning level
2016-09-13 23:06:45 +00:00
Matthew Fritze
10d7e4c060 Prevent Data Usage Settings crash on phones without cellular history
Refactored the logic to determine the data usage summary mark which now
correctly tests for null.

Bug: 30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: make RunSettingsRoboTests
2016-09-13 22:59:53 +00:00
Fan Zhang
d10686ff4f Add string for set data warning.
Bug: 26934313
Test: make Settings
Change-Id: I97dde849d9f0785c536b01471ab243aaccc85400
2016-09-13 12:59:22 -07:00
Matthew Fritze
25437d7c61 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.

Test: Robo tests in next cherry-pick.

Change-Id: I70398d4656b6da4233b2bfa0da6ffa7402ead69b
Fixes: 26932938
(cherry picked from commit 9fad289ca9)
2016-09-13 12:56:45 -07:00
Felipe Leme
19591904c6 Merge "Improved storage accounting:" into nyc-mr1-dev am: 96c128cc99
am: bd91315654

Change-Id: I2228b394469da0242f0a961f478081fb5a26bf8b
2016-09-13 19:47:56 +00:00
Felipe Leme
1469dde1a0 Improved storage accounting: am: 7358b7802f
am: 49260969b7

Change-Id: If4dc3b03fe521d91002a00beb9230caef1100a46
2016-09-13 19:47:55 +00:00
Felipe Leme
bd91315654 Merge "Improved storage accounting:" into nyc-mr1-dev
am: 96c128cc99

Change-Id: I2acba417e0d6af66ca97344133c688eaffb181bb
2016-09-13 19:44:55 +00:00
Felipe Leme
49260969b7 Improved storage accounting:
am: 7358b7802f

Change-Id: Ie5839177bf44a0269e04d17a2f33012e3029ab38
2016-09-13 19:44:54 +00:00
TreeHugger Robot
96c128cc99 Merge "Improved storage accounting:" into nyc-mr1-dev 2016-09-13 19:39:23 +00:00
Felipe Leme
7358b7802f Improved storage accounting:
- Removed duplicated entry for DIRECTORY_MOVIES.
- Added DIRECTORY_DOWNLOADS to Other.
- Added unaccounted data to Other.
- Changed Other description so it mention non-visible items.

Often sub-directories of /data are populated with data that Settings
doesn't have control of (for example, on /data/ramdump), so they're more
suitable to be displayed in the "Other" section.

BUG: 31091863
Fixes: 30952263

Change-Id: Ibf54f9dd96456575109e2e281f3780da84f70d92
2016-09-13 10:49:34 -07:00
Bill Yi
546d9d139c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9b5a8224e8 -s ours
am: 507f18c577  -s ours

Change-Id: Icb6002f26a57a5539aa55faec20a11c5e68d3a60
2016-09-13 08:56:42 +00:00
Bill Yi
69eb2d9088 Import translations. DO NOT MERGE am: 44f9a3fd1e -s ours
am: 3978b56311  -s ours

Change-Id: Idf9affe16dd82e63503b1a8bc908cdd64e7ccc3b
2016-09-13 08:56:41 +00:00
Bill Yi
507f18c577 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9b5a8224e8  -s ours

Change-Id: If68c92dfe3f3a3f5f0ac814179c7b79673394267
2016-09-13 08:49:04 +00:00