Commit Graph

31568 Commits

Author SHA1 Message Date
Ruben Brunk
105a1d35b4 Merge "Improve text for VR Settings." into nyc-mr1-dev am: 3b90cfc71e am: 64f364ebb6
am: 7c9d08bcaf

Change-Id: I1eea62d10b997fc28d6d31f6f4da51848940900f
2016-09-27 02:30:50 +00:00
Ruben Brunk
9623588d81 Improve text for VR Settings. am: f345b8cb36 am: 5220c925fc
am: 14352821d0

Change-Id: Id4a9d03885dcfda744729eb3635e62f57516ad87
2016-09-27 02:30:35 +00:00
Salvador Martinez
9c959b2969 Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev am: 04d55c4417 am: 76974a5c19
am: 37d2d0d058

Change-Id: I21b9f57af0f7d68af634ec9606519a4c74fb70b7
2016-09-27 02:30:21 +00:00
Salvador Martinez
3dd10e14e8 Added strings for advanced wifi accessibility am: 45f79c2f20 am: ba0baa312d
am: 3d710bdc70

Change-Id: I4ac7b76f50b66fccd1d04cdc7004e3ed66d6f45d
2016-09-27 02:30:07 +00:00
Ruben Brunk
7c9d08bcaf Merge "Improve text for VR Settings." into nyc-mr1-dev am: 3b90cfc71e
am: 64f364ebb6

Change-Id: Idb82cc662e8174cfd70affbf83e64360a1fef134
2016-09-27 01:11:10 +00:00
Ruben Brunk
14352821d0 Improve text for VR Settings. am: f345b8cb36
am: 5220c925fc

Change-Id: I3656ba4555e4e30b5bddf7531429ddd60d175c2f
2016-09-27 01:10:57 +00:00
Ruben Brunk
64f364ebb6 Merge "Improve text for VR Settings." into nyc-mr1-dev
am: 3b90cfc71e

Change-Id: I512eea5a7430fd5195aef6a55b3475f2c4e1f0ab
2016-09-27 01:08:44 +00:00
Ruben Brunk
5220c925fc Improve text for VR Settings.
am: f345b8cb36

Change-Id: I9fef78adc08d9a652d5e008cb019ec5d5364752a
2016-09-27 01:08:43 +00:00
Ruben Brunk
3b90cfc71e Merge "Improve text for VR Settings." into nyc-mr1-dev 2016-09-27 00:57:36 +00:00
Salvador Martinez
37d2d0d058 Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev am: 04d55c4417
am: 76974a5c19

Change-Id: I5d1ea4d3fbe1823d69ee316454a8638afc9a8ad0
2016-09-27 00:56:14 +00:00
Salvador Martinez
3d710bdc70 Added strings for advanced wifi accessibility am: 45f79c2f20
am: ba0baa312d

Change-Id: I170e9349924f2964d95088ad04a057ec70431530
2016-09-27 00:56:01 +00:00
Stephen Chen
440cb8cb49 Merge "Fix display summary string in Setup Wizard preview screen." 2016-09-27 00:38:38 +00:00
Salvador Martinez
76974a5c19 Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev
am: 04d55c4417

Change-Id: Ic83ff6a605156d3b3ef2753de2cd1e6392dba248
2016-09-27 00:34:40 +00:00
Salvador Martinez
ba0baa312d Added strings for advanced wifi accessibility
am: 45f79c2f20

Change-Id: I5207f6b4e2c43e0aaa9e1b4e849f05e25e29b7a8
2016-09-27 00:34:40 +00:00
Salvador Martinez
04d55c4417 Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev 2016-09-27 00:26:09 +00:00
Salvador Martinez
45f79c2f20 Added strings for advanced wifi accessibility
These strings are needed for talkback to
say the correct thing when a user taps
on advanced options in the dialog to
add a new access point.

Test: Accessibility Scanner
Bug: 30079196
Change-Id: I6208cc01f6434780ba56296769cfaa05b6a6aaaa
2016-09-26 17:07:27 -07:00
Lei Yu
56cdee5ca9 Merge "Disable the control of draw over permission for SystemUI" 2016-09-26 23:26:33 +00:00
Ruben Brunk
f345b8cb36 Improve text for VR Settings.
Bug: 31101223

Change-Id: I5c529e76cc6b802cae01301f67dad2e51fb4ad49
2016-09-26 15:50:53 -07:00
Stephen Chen
61462ae0ec Fix display summary string in Setup Wizard preview screen.
Bug: 31752790
Fixes: 31752790
Test: manual
Change-Id: I4f94dcd123cf9a95a6b3ef605e6575d844e338bb
2016-09-26 15:40:03 -07:00
Andre Eisenbach
48f1e9fbd5 Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev am: 7a2af50ae3 am: 30a6a743d5
am: 00a224d630

Change-Id: Ib3bd9917d9174996a5af26fb60f0dc54d3e73be1
2016-09-26 22:06:07 +00:00
Andre Eisenbach
aa0bf8e052 Move Bluetooth device "Forget" button to the left am: aece754d77 am: 75e4d44f0d
am: ecee9e662d

Change-Id: Ibfc862406b4e67426a8686a7090d1ef1a93e7bb3
2016-09-26 22:05:52 +00:00
Andre Eisenbach
00a224d630 Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev am: 7a2af50ae3
am: 30a6a743d5

Change-Id: I6fda405cdbb087cd4d20a2fa25d69171336f1b51
2016-09-26 21:55:25 +00:00
Andre Eisenbach
ecee9e662d Move Bluetooth device "Forget" button to the left am: aece754d77
am: 75e4d44f0d

Change-Id: If9211aff18dcbcd0f3cfdf47fdbb5f4042fddac6
2016-09-26 21:55:12 +00:00
Andre Eisenbach
30a6a743d5 Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev
am: 7a2af50ae3

Change-Id: I4b5231d5968bc1717a6e91acc3c79f69e84c35ff
2016-09-26 21:52:14 +00:00
Andre Eisenbach
75e4d44f0d Move Bluetooth device "Forget" button to the left
am: aece754d77

Change-Id: I5732a476c5f6fb6753fc3d8a59b5ce9c293692b1
2016-09-26 21:52:13 +00:00
TreeHugger Robot
7a2af50ae3 Merge "Move Bluetooth device "Forget" button to the left" into nyc-mr1-dev 2016-09-26 21:43:47 +00:00
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
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
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
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