Commit Graph

10612 Commits

Author SHA1 Message Date
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
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
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
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
Fan Zhang
55b61aa884 Add string for set data warning. am: d10686ff4f am: 5a0ab072f0
am: 6ba8fdff89

Change-Id: I67c03c375b8998c112ece2fad39d172e06d37a82
2016-09-14 17:13:51 +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
6ba8fdff89 Add string for set data warning. am: d10686ff4f
am: 5a0ab072f0

Change-Id: I847b02df7c58f33bff865c7d419b168c5325d155
2016-09-13 23:25:13 +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
Felipe Leme
3b0a9cb54f Improved storage accounting: am: 7358b7802f am: 49260969b7
am: 1469dde1a0

Change-Id: I2cb0e03aab3c79bde080ea3b73a1ad31c72d5cfa
2016-09-13 21:35:33 +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
Felipe Leme
1469dde1a0 Improved storage accounting: am: 7358b7802f
am: 49260969b7

Change-Id: If4dc3b03fe521d91002a00beb9230caef1100a46
2016-09-13 19:47: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
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
e0f4cafe07 Update Night Light summary strings am: ed765a4817 am: 82926aebdf
am: aaf0bc56ab

Change-Id: I25da4ef00be6a5e9651073572ae51b6f2884f669
2016-09-12 22:00:00 +00: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
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
Salvador Martinez
923534f641 resolve merge conflicts of 8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
2016-09-07 10:24:03 -07:00
Salvador Martinez
8ec70281ee Fixed Sound Settings summary text am: b706d4e956
am: d39c1fa395

Change-Id: I73fa598eb0067b5c1497e7bac803b9d349eaf86c
2016-09-07 16:17:14 +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
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
Robin Lee
bed8559a20 Enable the switch in TrustedCredentialsSettings
And match the behaviour of the dialog button that does the same thing,
so it only asks for confirmation when something is being irrevocably
deleted.

The dialog button should not be removed as it's used by system services
that deeplink to a specific cert to give the option of reviewing,
removing, or trusting it.

Bug: 31159682
Change-Id: I4fb3f38f8ab0e80e5c2dca0fc3d6d3bd4db26bb6
2016-09-02 11:03:32 +01:00
TreeHugger Robot
cd3ba14277 Merge "Update Bluetooth toggle UI to UX spec - settings" 2016-09-02 03:37:14 +00:00
Svet Ganov
0cf1298a44 Update Bluetooth toggle UI to UX spec - settings
Change-Id: I171d3e55e8a480d304e4dc4e0debbd2f3ab27651
2016-09-01 16:47:09 -07:00
Bill Yi
3afce04bf8 Import translations. DO NOT MERGE
Change-Id: I97dae1e7f6b416d7a676e9c2c76942f6ada9582a
Auto-generated-cl: translation import
2016-08-31 21:56:25 -07:00
Bill Yi
a3d205dddd Import translations. DO NOT MERGE
Change-Id: I9a5e888a9efdaa910ff1c1f076f5fffabd7d190c
Auto-generated-cl: translation import
2016-08-31 21:51:14 -07:00
Andreas Gampe
ada98fb5b3 resolve merge conflicts of d30af7c to master
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
2016-08-30 20:36:50 -07:00
Todd Kennedy
d30af7c247 Implement Web Action settings am: d5824967ee
am: 1fc2e5dcb7

Change-Id: I4e4976e848af3e8d12b65730147be1257fed382c
2016-08-31 02:28:38 +00:00
Todd Kennedy
1fc2e5dcb7 Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
2016-08-31 02:25:37 +00:00
TreeHugger Robot
1721e4510f Merge "Implement Web Action settings" into nyc-mr1-dev 2016-08-31 02:20:47 +00:00
Andrew Sapperstein
e6c06f826f Use LinkTextView for support disclaimer text. am: 7e9146950d am: d63e187b1a am: c3733b8653
am: 25d10fd293

Change-Id: Ie1ac8f05cbe91dd99ea3840c02932ba98050eb91
2016-08-31 01:19:30 +00:00
Andrew Sapperstein
25d10fd293 Use LinkTextView for support disclaimer text. am: 7e9146950d am: d63e187b1a
am: c3733b8653

Change-Id: I0ecdd164e846e6af7085ff83e8c177f085b9e958
2016-08-31 00:39:59 +00:00
Andrew Sapperstein
c3733b8653 Use LinkTextView for support disclaimer text. am: 7e9146950d
am: d63e187b1a

Change-Id: Iffd7cc56eb9ee612b8c86a668f4851f229b746ac
2016-08-31 00:34:45 +00:00
Andrew Sapperstein
d63e187b1a Use LinkTextView for support disclaimer text.
am: 7e9146950d

Change-Id: Ia4a998039bfcdea3419a512d342665248f0b7ac3
2016-08-31 00:28:27 +00:00
Andrew Sapperstein
7e9146950d Use LinkTextView for support disclaimer text.
LinkTextView uses LinkAccessibilityHelper to properly handle
making links accessible.

Deleted Settings' outdated fork for the version in setupwizardlib.

Test: manual

Change-Id: I38c031f96b5be0d45e4cc1aa358f95b229f17480
Fixes: 31077012
2016-08-30 19:57:39 +00:00