Commit Graph

10961 Commits

Author SHA1 Message Date
TreeHugger Robot
2d7d53edd6 Merge "Update the color for the master switch divider." 2017-02-07 01:55:21 +00:00
Doris Ling
e5d0eca799 Merge "Combine Language & region and Input & gestures in System settings." 2017-02-07 01:51:20 +00:00
Fan Zhang
ebccf8d093 Update "more" icon so the 3 dots are perfectly round. am: de172c7727
am: 5b27d0638e

Change-Id: I97985601d1e7f6bf643f2109329d42e457e4d0cc
2017-02-06 23:13:00 +00:00
TreeHugger Robot
5d53f98eaf Merge "Move Special access from Default apps to Apps & notifications." 2017-02-06 23:07:51 +00:00
Fan Zhang
5b27d0638e Update "more" icon so the 3 dots are perfectly round.
am: de172c7727

Change-Id: I66f612778874d84e23f0e757b4138df1672c4226
2017-02-06 23:03:11 +00:00
Doris Ling
4f1eca05be Update the color for the master switch divider.
Change the background attr for the divider to dividerVertical.

Change-Id: I6437c74c0951e43c6d438d282f7c686249cb9dd6
Fix: 34978085
Test: Visual
2017-02-06 14:40:13 -08:00
TreeHugger Robot
c2ff3b972c Merge "Make picker icons scale larger." 2017-02-06 21:18:09 +00:00
Doris Ling
9cdae72ba9 Move Special access from Default apps to Apps & notifications.
Update the apps settings xmls to move Special access up one level.

Change-Id: I5ac6ec65ce0a296c0152ce8a793e145b44c01f4a
Fix: 34976728
Test: Visual
2017-02-06 13:02:14 -08:00
Fan Zhang
de172c7727 Update "more" icon so the 3 dots are perfectly round.
Bug: 28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
2017-02-06 20:40:22 +00:00
Doris Ling
34cfd2e24f Combine Language & region and Input & gestures in System settings.
Merge preferences into one page, and update test.

Bug: 34976047
Test: make RunSettingsRoboTests
Change-Id: I5f15192e42f6054c02d4c8ffa9f25db3075da409
2017-02-06 11:46:48 -08:00
Stephen Chen
ac9f4af5e2 Make picker icons scale larger.
Bug: 34775322
Test: manual inspection.
Change-Id: Iaaa859874ec25a50677cb00bd963fc869c5b9649
2017-02-03 15:40:56 -08:00
Bill Yi
10246513d7 Import translations. DO NOT MERGE
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
2017-02-02 23:43:15 -08:00
songchenxi
80d38d6735 Provide more context for "App-level permissions"
Test: Manual
bug: 34795904
Change-Id: I79d9895b4c719bbd742d1714b909b2766b279dff
2017-02-02 14:42:44 -08:00
TreeHugger Robot
00537955f2 Merge "Hide ConfigureWifiPreference tiles behind Advanced" 2017-02-02 18:08:47 +00:00
TreeHugger Robot
04354e1fda Merge "Fix string translation by providing context" 2017-02-02 17:41:21 +00:00
Robin Lee
806fbef0c6 Merge "Revert "Change launcher icons to MaskableIconDrawable Test: manual test"" 2017-02-02 14:52:16 +00:00
Robin Lee
728d0bc4a0 Revert "Change launcher icons to MaskableIconDrawable Test: manual test"
This reverts commit a8bd6c1bb8.

Change-Id: Iad92e544854776dcb9c4d7d3feeb2ac1b2a411d9
2017-02-02 11:33:37 +00:00
Tony Mak
8443894a08 Fix string translation by providing context
Bug: 33644656

Test: N/A

Change-Id: I56913f7df01d7f527ad8f2ed86b98c6363251b83
2017-02-02 10:24:39 +00:00
Stephen Chen
a7b27b22b9 Hide ConfigureWifiPreference tiles behind Advanced
Also reordered the preferences.

Bug: 34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
2017-02-01 17:57:22 -08:00
Daniel Nishi
d1172942ee Merge "Add a music apps view to the Storage Settings." 2017-02-01 21:01:56 +00:00
TreeHugger Robot
0d07305ca0 Merge "Change launcher icons to MaskableIconDrawable Test: manual test" 2017-02-01 18:57:54 +00:00
Hyunyoung Song
a8bd6c1bb8 Change launcher icons to MaskableIconDrawable
Test: manual test

b/34853793

Change-Id: I3376c03e84a0a9d94190b930f16596b3e48e9a9d
2017-01-31 17:57:33 -08:00
TreeHugger Robot
cebd60f3b3 Merge "Increase character limit for a string" 2017-02-01 01:26:00 +00:00
TreeHugger Robot
e5c2d1fbe3 Merge "Add summary for items in App Usage List in Battery page" 2017-01-31 23:48:28 +00:00
Julia Reynolds
37326a6023 Merge "Fix notification assistant setting" 2017-01-31 20:46:18 +00:00
William Mee
8be6862021 Merge "Adds a default for the badging curve thresholds to Settings app resources; this will be the fall-back default used by the WifiSettings in follow-on work." 2017-01-31 16:54:48 +00:00
Julia Reynolds
5bee768257 Fix notification assistant setting
Test: make cts-verifier
Change-Id: I9029e792ef3d32e433012d86ba828e3c741799cb
2017-01-31 10:47:57 -05:00
Bill Yi
2a3b062c4a Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
2017-01-30 23:10:41 -08:00
songchenxi
8c268e08d4 Increase character limit for a string
Increase the "App-level permission" string's character limit from 30
to 42

Test: Manual
bug: 34810404
Change-Id: Idaf7495ee45a55afc4fa5a9541f2ed12b9e76386
2017-01-30 22:49:24 -08:00
Stephen Chen
9d2712cd78 Move AdvancedWifiSettings into ConfigureWifiSettings.
Bug:34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.

Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
2017-01-30 12:43:08 -08:00
Julia Reynolds
5d1506a2af Show channel groups in settings.
Test: manual
Change-Id: Icfaed2d2d898245fcfa50b25d7ad456e4db07bae
2017-01-30 14:58:35 -05:00
Anton Philippov
e80a28ee18 Merge "Add a screen to show OEM backup settings." 2017-01-30 16:39:42 +00:00
Anton Philippov
adfec5563e Add a screen to show OEM backup settings.
Moves the backup settings logic to BackupSettingsHelper and
BackupSettingsActivity:
- If the manufacturer provides the intent and the label for their backup
settings in the config.xml, a new intermediate fragment is shown for
Backup settings to let the user pick either standard backup settings or
OEM provided backup settings.
- If config.xml doesn't contain the intent, BackupSettingsActivity is
used as a trampoline activity to launch backup settings provided by the
backup transport of the default backup settings activity, i.e.
PrivacySettingsActivity.

Bug: 34700410
Bug: 33655074
Bug: 33654991
Test: make RunSettingsRoboTests
Change-Id: I78e340fbf926b2a9dc2c4e3942f9337c3c7a933c
2017-01-30 16:17:28 +00:00
Nicolas Prévot
67b3450f33 Merge "Add policy transparency to Settings > device administrators" 2017-01-30 11:24:01 +00:00
jackqdyulei
3ee22131a4 Add summary for items in App Usage List in Battery page
This summary shows the active time of the app. For example
"Used for 27m".

Bug: 34467139
Test: RunSettingsRoboTests & Take screenshots
Change-Id: I0ef48427ad21be4dacd290fffb2c5d519ef58506
2017-01-27 14:15:38 -08:00
TreeHugger Robot
8201bcb710 Merge "Move intent action to xml" 2017-01-27 20:49:03 +00:00
TreeHugger Robot
7036d46889 Merge "modified settings to use settingslib class" 2017-01-27 20:35:35 +00:00
songchenxi
dbf78d4c03 Move intent action to xml
This is a follow-up change for ag/1798497 which move the implementation
of OnPreferenceClickListener to the xml.
Test: Manual
bug: 34400189

Change-Id: I4691beecf829e8d98d5c6188b3ff74f4902104d2
2017-01-27 11:05:27 -08:00
Andrew Sapperstein
c28269ebd2 Finalize string for usage alerts. am: 59fd24cde2
am: 251c91d974

Change-Id: I90392ba7d7cd1c3ac47c925dfb6cdcea8325ec53
2017-01-27 03:41:44 +00:00
Andrew Sapperstein
251c91d974 Finalize string for usage alerts.
am: 59fd24cde2

Change-Id: I79519e4c1f04dd2eee32320b4d8c4482fd4f2830
2017-01-27 03:39:48 +00:00
TreeHugger Robot
f15b23ad65 Merge "Finalize string for usage alerts." into nyc-mr2-dev 2017-01-27 03:37:45 +00:00
Andrew Sapperstein
59fd24cde2 Finalize string for usage alerts.
Test: manual
Bug: 34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
2017-01-26 17:30:30 -08:00
songchenxi
b9cf917f40 Location Setting change for O
This is a change that adds a link from location settings to location
permissions

Test: Manual

Bug: 34400189
Change-Id: If873fbb6e53c1fd86a3cfe38e06465cdec56bef8
2017-01-26 09:33:26 -08:00
Nicolas Prevot
4735488902 Add policy transparency to Settings > device administrators
In Settings > device administrators: if the user wants to remove
a work profile but DISALLOW_REMOVE_MANAGED_PROFILE is set: show
policy transparency.

BUG:33925172
BUG:34455202
Test: manual
Change-Id: Ifbb9806e92e759039d592af29568bffce5fbb92a
2017-01-26 12:55:50 +00:00
Stefanot
3c019a8714 *DO NOT MERGE* Create new suggestion category for backup.
am: 1c72ce06d1

Change-Id: I07d65c9045c97ac62e4d7bfc0fd96a92fdab5809
2017-01-26 10:35:45 +00:00
Stefano Tommasini
a04697a951 Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev 2017-01-26 10:31:15 +00:00
Steven Moreland
dba28ecbd7 Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c am: ec0e1fb59f
am: 7ea5b6d740

Change-Id: I2c9d79da43142e440f7c79b85904a94c2af65b76
2017-01-26 10:09:55 +00:00
Steven Moreland
7ea5b6d740 Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c
am: ec0e1fb59f

Change-Id: I7bb618cdbe0bc925b214b9184652864ad6b5a8ba
2017-01-26 10:06:43 +00:00
Steven Moreland
ec0e1fb59f Merge "Development Options: toggle binderized hals" am: 5f854f39a8
am: 8076dcde0c

Change-Id: Idb3f71707b7b1b091e3a18517852fff66e01cf08
2017-01-26 10:03:46 +00:00
Steven Moreland
8076dcde0c Merge "Development Options: toggle binderized hals"
am: 5f854f39a8

Change-Id: Id05768135b0609e917f4e1888caf2724ebf9ba3a
2017-01-26 10:01:15 +00:00