Commit Graph

27557 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
82926aebdf Update Night Light summary strings
am: ed765a4817

Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b
2016-09-12 21:00:57 +00:00
Justin Klaassen
ed765a4817 Update Night Light summary strings
Bug: 30771506
Test: Verified new strings show up in Night Light settings.
Change-Id: I36cc92d2644016f8f417daf9c06bccbe9fbd2d8c
2016-09-12 11:43:14 -07:00
Fyodor Kupolov
0ec8187b46 Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
am: 4b60607038

Change-Id: Ifbdf9af6b7119e9d5b696ab9e95b7a8a384c6138
2016-09-09 23:46:50 +00:00
Fyodor Kupolov
26a0f7037a Ignore onPreferenceChange for top level preference
am: bf88b269ca

Change-Id: Ib5208cb8b7d1a0bbaeed4ddbdbf6c15bce8b1b49
2016-09-09 23:46:49 +00:00
Fyodor Kupolov
4b60607038 Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev 2016-09-09 23:30:35 +00:00
Jim Miller
cfc960df98 Merge "Check for missing preference before setting title." into nyc-mr1-dev
am: ca9a78f2d1

Change-Id: I51aa91e1216c23773604a26ab3dabe0d4f5257aa
2016-09-09 20:21:48 +00:00
Jim Miller
68306c3409 Check for missing preference before setting title.
am: 06458be226

Change-Id: I1bbca453c4f58554bf7ec96a211496e3bce2acac
2016-09-09 20:21:47 +00:00
TreeHugger Robot
ca9a78f2d1 Merge "Check for missing preference before setting title." into nyc-mr1-dev 2016-09-09 20:15:13 +00:00
Jim Miller
06458be226 Check for missing preference before setting title.
Some preferences aren't available due to DPM, so check for null
before setting the title.

Fixes bug 31184335

Change-Id: I69f97274eef87755269fd8f7897edcc36087f8b2
2016-09-09 11:54:12 -07:00
Todd Kennedy
26c4f2b42e Merge "Direct launch to web action" into nyc-mr1-dev
am: e162563e10

Change-Id: Icafef8093cae5e4838be46d39405175b91c3bbbf
2016-09-09 01:59:33 +00:00
Todd Kennedy
de2da206af Direct launch to web action
am: 2ef1aa5894

Change-Id: I08a9f74e7ddb0f72881f82da40d950bf6b63e7d6
2016-09-09 01:59:32 +00:00
TreeHugger Robot
e162563e10 Merge "Direct launch to web action" into nyc-mr1-dev 2016-09-09 01:50:07 +00:00
Todd Kennedy
2ef1aa5894 Direct launch to web action
We want to be able to direct launch into the web action settings
Fixes: 31338071

Change-Id: I295729b8c9e0d3c1196ed820a9e9f6163bf611b4
2016-09-08 13:51:12 -07:00
Salvador Martinez
9079070347 Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
am: 20d19a89da

Change-Id: Ia991091c2bcb17c61bb0dc0fca44f26995633c69
2016-09-07 16:14:45 +00:00
Salvador Martinez
d39c1fa395 Fixed Sound Settings summary text
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb
2016-09-07 16:14:44 +00:00
Salvador Martinez
20d19a89da Merge "Fixed Sound Settings summary text" into nyc-mr1-dev 2016-09-07 16:06:41 +00:00
Bill Yi
9f2a012fcf Import translations. DO NOT MERGE
am: 596da67f4b  -s ours

Change-Id: Id618745ef778ce8c0d49cc2b917322c540f48ce4
2016-09-07 12:03:59 +00:00
Bill Yi
596da67f4b Import translations. DO NOT MERGE
Change-Id: Ic79af1cb3c770ec68e0665d9885e8e189497075f
Auto-generated-cl: translation import
2016-09-07 03:20:53 -07:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
2016-09-06 17:23:50 -07:00
Maurice Lam
c74cefce54 [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba -s ours am: 17ec053dd5 am: 27aabcd4df
am: 6a51dfdcf3

Change-Id: I18132d9ed3095ac0d18616405d82ecec0e7cc8ae
2016-09-06 23:28:49 +00:00