Commit Graph

31699 Commits

Author SHA1 Message Date
Doris Ling
d2f32f6b4a Merge "Update gesture settings text." into nyc-mr1-dev am: ace4753224 am: ad0d72fee7
am: ed9fc06b50

Change-Id: I30bbcdf14ea8005894e56774e2364a8f0ec97fa1
2016-09-26 20:40:09 +00:00
Doris Ling
dc6f7bd0b2 Update gesture settings text. am: 8ff630966a am: 5252165f6a
am: e816be1565

Change-Id: Id12528f90bf67eb3ce66f7fe4ca2fa5b9d8c509a
2016-09-26 20:39:54 +00:00
Doris Ling
ed9fc06b50 Merge "Update gesture settings text." into nyc-mr1-dev am: ace4753224
am: ad0d72fee7

Change-Id: Ie07ca705d81b2c8e09db4d6498d0e28f3ab9c661
2016-09-26 20:37:38 +00:00
Doris Ling
e816be1565 Update gesture settings text. am: 8ff630966a
am: 5252165f6a

Change-Id: I5dcac554e9dd345785b3975ab7af5cab6cfde32f
2016-09-26 20:37:25 +00:00
Doris Ling
ad0d72fee7 Merge "Update gesture settings text." into nyc-mr1-dev
am: ace4753224

Change-Id: Ia0497a0d0ea026eb279246034d16b40fbc2c0902
2016-09-26 20:34:54 +00:00
Doris Ling
5252165f6a Update gesture settings text.
am: 8ff630966a

Change-Id: Ic05df8585fc113cf276f0606b680fd4f74e9a208
2016-09-26 20:34:53 +00:00
Doris Ling
ace4753224 Merge "Update gesture settings text." into nyc-mr1-dev 2016-09-26 20:27:39 +00:00
jackqdyulei
0162daa651 Disable the control of draw over permission for SystemUI
Bug: 31077838
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk \
&& adb shell am instrument -w  \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: I760590f5558f2d686ffbfe78234a8b08e13883fd
2016-09-26 13:22:04 -07:00
Daniel Nishi
b3405649fa Fix a deprecated config string name for the storage manager settings.
The old string was used for configuration purposes, but the change was
removed. A previous patch accidentally used the old string for
choosing if the activity was exported or not.

Bug: 31621740

Change-Id: I9471e3a4c6d64d3fb8be7cbfcf058d35364892a5
2016-09-26 11:40:55 -07:00
Doris Ling
8ff630966a Update gesture settings text.
Update the preference title and summary for Ambient Display Double-tap
and Pickup gestures.

Test: manual - launch gestures settings and verify latest strings are
used.

Bug: 30595437
Change-Id: I029c2048603563ea20f5030e381a9e7a624d0e85
2016-09-26 17:19:35 +00:00
Bill Yi
7552fb5a17 Import translations. DO NOT MERGE
Change-Id: I8cf027c5077ed24be8d68d191a6da201df7fdd0d
Auto-generated-cl: translation import
2016-09-26 09:48:57 -07:00
Bill Yi
47ff6882fb Import translations. DO NOT MERGE
Change-Id: I4f03344d3ce65076256892ae63803239c5c47718
Auto-generated-cl: translation import
2016-09-26 09:44:05 -07:00
Bill Yi
0d07d0c79c Import translations. DO NOT MERGE
Change-Id: I69f2d26ec0a8a06fc611a68740ea9ce5184c124e
Auto-generated-cl: translation import
2016-09-26 09:35:48 -07:00
Fan Zhang
ad7023a406 Merge "Fix crash when changing data restriction for non-app UID." 2016-09-26 16:01:31 +00:00
Robin Lee
660a944128 Merge "Enable the switch in TrustedCredentialsSettings" 2016-09-26 15:54:48 +00:00
Daniel Nishi
505287caeb Merge "Add storage manager settings activity." into nyc-mr1-dev am: 798a28ace9 am: 4ee3ce5732
am: 8cf30cafff

Change-Id: If1fe711464ea3796a3c2cc3035c92ee66e437e19
2016-09-26 09:21:11 +00:00
Daniel Nishi
0c6c11ca3e Add storage manager settings activity. am: 3981889d1d am: 2382850d65
am: a55d5b6b3a

Change-Id: Ia41298ec0f4640514881c727fa8c6ae35d934458
2016-09-26 08:28:28 +00:00
Doris Ling
ff46067437 Fix build error in DisplaySettings
Add static import for android.provider.Settings.Secure.DOZE_ENABLED

Test: make pass
Bug: 31716184
Change-Id: Ia958b3089f3d52897b09072d0dfe4a472176ff89
2016-09-23 20:27:48 -07:00
Fan Zhang
2d6bf057f8 Avoid over logging preference changes.
When preference screen is created all prefence goes through
SharedPreferenceLogger once. We don't want to log it as preference
change because it's just initial display. Subsequent preference logger
calls should result in logging.

Bug: 30914916
Test: make RunSettingsRoboTests
Change-Id: Icaee9137c55555f4db7839ff0381a13ccd420190
2016-09-23 18:01:13 -07:00
Doris Ling
48b126be5c Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51 am: f79a9b397e
am: 799388df91

Change-Id: I3368cd81b3c7badf2b1acf5eb0b293c1412b8687
2016-09-24 00:35:32 +00:00
Doris Ling
430025c4d6 Split Ambient Display settings. am: 1ad58d0abf am: f89766dbab
am: 0dfe46fe58

Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
2016-09-24 00:35:24 +00:00
Daniel Nishi
8cf30cafff Merge "Add storage manager settings activity." into nyc-mr1-dev am: 798a28ace9
am: 4ee3ce5732

Change-Id: I575b3ab0ab21cc3af4ee2533e1372bfd4c6ca0ff
2016-09-24 00:27:22 +00:00
Daniel Nishi
a55d5b6b3a Add storage manager settings activity. am: 3981889d1d
am: 2382850d65

Change-Id: Ic105308a53273c6705027d13fb2430537116a0ce
2016-09-24 00:24:59 +00:00
Daniel Nishi
4ee3ce5732 Merge "Add storage manager settings activity." into nyc-mr1-dev
am: 798a28ace9

Change-Id: If2150702a9ef06c0d4e4469fac2646dce3a259e6
2016-09-24 00:23:38 +00:00
Daniel Nishi
2382850d65 Add storage manager settings activity.
am: 3981889d1d

Change-Id: I50224492a1ed42d6aa38fce72a905e35ee672a83
2016-09-24 00:20:27 +00:00
Andre Eisenbach
aece754d77 Move Bluetooth device "Forget" button to the left
"Forget" and "OK" actions are too close together.

Bug: 31693959
Change-Id: Iee452347a53b186df7aecad5d971edcfb7645f1d
2016-09-24 00:16:21 +00:00
Daniel Nishi
798a28ace9 Merge "Add storage manager settings activity." into nyc-mr1-dev 2016-09-24 00:15:49 +00:00
Doris Ling
799388df91 Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51
am: f79a9b397e

Change-Id: I9a5498d766c23d7d2431706feacf66a7bb1da091
2016-09-24 00:07:21 +00:00
Doris Ling
0dfe46fe58 Split Ambient Display settings. am: 1ad58d0abf
am: f89766dbab

Change-Id: If17ab5951a9b8a2a5b68a1fcc2492de8a72f0c08
2016-09-24 00:07:17 +00:00
Doris Ling
f79a9b397e Merge "Split Ambient Display settings." into nyc-mr1-dev
am: 4f8a703d51

Change-Id: I0855a17e05c387a63241bfaa5c910d4625e2e5ce
2016-09-24 00:05:19 +00:00
Doris Ling
f89766dbab Split Ambient Display settings.
am: 1ad58d0abf

Change-Id: Ie47c7504728bb225214ee8c348af8a154cb5a1f2
2016-09-24 00:05:17 +00:00
TreeHugger Robot
4f8a703d51 Merge "Split Ambient Display settings." into nyc-mr1-dev 2016-09-24 00:00:05 +00:00
Fan Zhang
f4d937a0e0 Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am: c5bfd5f5a8 am: 8f621c8cfa
am: d9d34f78ab

Change-Id: I0a72326065e797603e1cbc3f133250c5cafe257f
2016-09-23 23:57:19 +00:00
Fan Zhang
e40eb2457a Fix NPE when trying to refreshes dnd condition. am: 98487f4d65 am: 80c589e1f8
am: f77c940f9a

Change-Id: Ib0f089321000e100dbbf4510ebb9d5bce3b3abca
2016-09-23 23:57:03 +00:00
Fan Zhang
d9d34f78ab Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am: c5bfd5f5a8
am: 8f621c8cfa

Change-Id: I9a05577aed82272d5040a03454289682aa5671fa
2016-09-23 23:44:49 +00:00
Fan Zhang
f77c940f9a Fix NPE when trying to refreshes dnd condition. am: 98487f4d65
am: 80c589e1f8

Change-Id: I64d75489f6e7066b2303c6e3fc3d4e6b0c8388c6
2016-09-23 23:44:36 +00:00
Fan Zhang
8f621c8cfa Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
am: c5bfd5f5a8

Change-Id: Ie0736338105b670e827b636091ef3235ef872489
2016-09-23 23:37:49 +00:00
Fan Zhang
80c589e1f8 Fix NPE when trying to refreshes dnd condition.
am: 98487f4d65

Change-Id: I27d984f6ebb1de4832d819a843c9cdbfeeabeaf8
2016-09-23 23:37:49 +00:00
Fan Zhang
c5bfd5f5a8 Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev 2016-09-23 23:31:43 +00:00
Daniel Nishi
3cf6ed8b40 Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am: 3843dd96f5 am: 95ce1811ed
am: 350c9a3ecb

Change-Id: I0de070dc7208e646a8b5d675d3fd299727bbc61c
2016-09-23 23:08:47 +00:00
Daniel Nishi
350c9a3ecb Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am: 3843dd96f5
am: 95ce1811ed

Change-Id: I22a87383234d2b909e4402093f587a4f60f52ed2
2016-09-23 22:52:37 +00:00
Daniel Nishi
ea88508fe3 Use a config flag instead of a RO flag for showing Manage Storage. am: c0b33f70ed am: bfe5afc270
am: fee35492b8

Change-Id: I1cddbd4012891ed97907ae392f26330bf528f822
2016-09-23 22:51:40 +00:00
Daniel Nishi
95ce1811ed Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev
am: 3843dd96f5

Change-Id: I6912a4d634152d40a9af1ab98f2303ec8288e55f
2016-09-23 22:41:15 +00:00
Daniel Nishi
fee35492b8 Use a config flag instead of a RO flag for showing Manage Storage. am: c0b33f70ed
am: bfe5afc270

Change-Id: I159cb08e7ef25802562603d4f8e297ffdf8d0f30
2016-09-23 22:34:22 +00:00
Doris Ling
1ad58d0abf Split Ambient Display settings.
1. Reverting the changes for Display->Ambient Display; this setting
   will control incoming notification pulse.
2. Added 2 separate entries in gestures settings to control pick up
   and double tap gestures-triggered pulsing for Ambient Display.
3. Added automated tests to verify the preference initializes to the
   correct default value, and also verify that toggling the preference
   updates the corresponding settings correctly.

Test: make SettingsTests

Bug: 30595437
Change-Id: I125bf75fc4ccfea126a00ffae4207fcb789f487a
2016-09-23 15:33:37 -07:00
Daniel Nishi
bfe5afc270 Use a config flag instead of a RO flag for showing Manage Storage.
am: c0b33f70ed

Change-Id: I5b178d6e345ecc43689e0e1b5d6102e60b33037a
2016-09-23 22:31:34 +00:00
Daniel Nishi
3843dd96f5 Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev 2016-09-23 22:19:12 +00:00
Fan Zhang
13566f29a5 Fix crash when changing data restriction for non-app UID.
Change-Id: Ie622e8e22bade33050865fe4135534b27995d523
Fixes: 31708057
Test: make RunSettingsRoboTests
2016-09-23 15:14:18 -07:00
Doris Ling
36c6abd605 Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev am: 2dc974a648 am: 41a32a2a5f
am: 9d283f3162

Change-Id: I5354639c64883ab4f8044aedc9cf54db58b6bd76
2016-09-23 22:07:12 +00:00
Doris Ling
b1a2417fe9 Use default switch preference view if gesture animations video is not available. am: 08886a0e91 am: 38693095e3
am: 7c8de075d8

Change-Id: Icd2dd9b1f58c0957d651742dab16b291afcd750c
2016-09-23 22:07:04 +00:00