Commit Graph

29694 Commits

Author SHA1 Message Date
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
Bill Yi
3978b56311 Import translations. DO NOT MERGE
am: 44f9a3fd1e  -s ours

Change-Id: I1894dccc51fc55d158197f5da2ea62333f01ee84
2016-09-13 08:49:04 +00:00
TreeHugger Robot
9b5a8224e8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-13 08:27:58 +00:00
Bill Yi
44f9a3fd1e Import translations. DO NOT MERGE
Change-Id: Ica434ea782eeb2e8efbabe56b2c25811a824181e
Auto-generated-cl: translation import
2016-09-12 23:35:38 -07:00
Justin Klaassen
440a790c88 Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev am: d8a275a1d2
am: acb9809e09

Change-Id: I34e004df56d69e4d8ade99876a02cd0944be4c34
2016-09-13 04:03:24 +00:00
Justin Klaassen
2369ded79d Disable NightDisplaySettingsActivity when not available am: e1a16c4f3e
am: b606c9ca78

Change-Id: I2ecc3899a85471cc928b3fe4d8500f3f3460bc95
2016-09-13 04:03:23 +00:00
Justin Klaassen
acb9809e09 Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
am: d8a275a1d2

Change-Id: Id01768d67598b6f7ff93450b6df6e07d4f38ee06
2016-09-13 04:00:53 +00:00
Justin Klaassen
b606c9ca78 Disable NightDisplaySettingsActivity when not available
am: e1a16c4f3e

Change-Id: I3c2bf9f76177af40bf0f2025978c7c9f34181004
2016-09-13 04:00:53 +00:00
TreeHugger Robot
d8a275a1d2 Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev 2016-09-13 03:51:08 +00:00
Phil Weaver
c2be318cdf Merge "Make a11y settings display consistent" into nyc-mr1-dev am: 9d6bce3667
am: db54ab8193

Change-Id: I7a4b3b6679028027c0141ce9e38c27b208abc3fc
2016-09-13 01:19:13 +00:00
Phil Weaver
02b9cb27bb Make a11y settings display consistent am: 99a66b5416
am: 17fb0f6cf5

Change-Id: Iebeeb744a08d0a89803d8743dbe85950b1320147
2016-09-13 01:19:12 +00:00
Phil Weaver
db54ab8193 Merge "Make a11y settings display consistent" into nyc-mr1-dev
am: 9d6bce3667

Change-Id: I8bbb9d0c8d604bd4f250911c9aa4fc96f0114251
2016-09-13 01:13:41 +00:00
Phil Weaver
17fb0f6cf5 Make a11y settings display consistent
am: 99a66b5416

Change-Id: Ic62d9ac58ebab8e52d9bb22c7c377d640fc027bb
2016-09-13 01:13:41 +00:00
Phil Weaver
9d6bce3667 Merge "Make a11y settings display consistent" into nyc-mr1-dev 2016-09-13 01:07:05 +00:00
Justin Klaassen
e1a16c4f3e Disable NightDisplaySettingsActivity when not available
Not every device supports "Night Light" so this change disables the
NightDisplaySettingsActivity entry point using the system internal
R.bool.config_nightDisplayAvailable value.

Fixes: 30919608
Test: adb shell am start -a android.settings.NIGHT_DISPLAY_SETTINGS
Change-Id: I202c93069daaea08a0d754dd2f6b3de8c249c361
2016-09-12 17:07:08 -07:00
Phil Weaver
99a66b5416 Make a11y settings display consistent
We were using two methods to decide whether or not to show
that an a11y service was enabled, one on the main
Accessibility screen and another on the individual service
screen. In some situations, an enabled service would show
up as enabled on the main screen but not enabled on its
individual screen.

Bug: 30829589
Change-Id: I560d86684a2fb8987d3dd06279e033ecb7cc1a58
2016-09-12 16:17:09 -07:00
Justin Klaassen
aaf0bc56ab Update Night Light summary strings am: ed765a4817
am: 82926aebdf

Change-Id: I861f710b4de7d034dddd4c4de1bec5e3e32ca0c7
2016-09-12 21:02:53 +00:00
Justin Klaassen
82926aebdf Update Night Light summary strings
am: ed765a4817

Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b
2016-09-12 21:00:57 +00:00