Xia Wang
c4e68c1dcd
am 2f633ca3
: am 8361a97c
: am 3e238230
: am 836eff87
: Merge "Add legacy VPN test framework and test cases" into klp-dev
...
* commit '2f633ca3a5813eb3fece716448308bf8e7d351ee':
Add legacy VPN test framework and test cases
2014-04-02 03:55:59 +00:00
Xia Wang
2f633ca3a5
am 8361a97c
: am 3e238230
: am 836eff87
: Merge "Add legacy VPN test framework and test cases" into klp-dev
...
* commit '8361a97c43a49b5e7528afd5baeca624d909bbf9':
Add legacy VPN test framework and test cases
2014-04-02 03:51:38 +00:00
Xia Wang
8361a97c43
am 3e238230
: am 836eff87
: Merge "Add legacy VPN test framework and test cases" into klp-dev
...
* commit '3e23823015d2ad0679d89adc2a62c7d568adada8':
Add legacy VPN test framework and test cases
2014-04-02 03:45:56 +00:00
Xia Wang
3e23823015
am 836eff87
: Merge "Add legacy VPN test framework and test cases" into klp-dev
...
* commit '836eff87a93f5b2857b41763197ab6782581aafc':
Add legacy VPN test framework and test cases
2014-04-02 03:40:26 +00:00
Xia Wang
836eff87a9
Merge "Add legacy VPN test framework and test cases" into klp-dev
2014-04-02 03:36:50 +00:00
Xia Wang
340bda7154
Add legacy VPN test framework and test cases
...
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases
Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
2014-04-01 17:45:58 -07:00
Paul Lawrence
9ac2d81d9f
Show OwnerInfo on CryptKeeper screen
...
Depends on framework change from
https://googleplex-android-review.git.corp.google.com/#/c/435138/
Bug 13526708
Change-Id: I16189b629b5515ec5175e05155ba4ec0c27d22fb
2014-04-01 13:47:01 -07:00
Fabrice Di Meglio
627ef9706b
Merge "Add indexing for Notifications preferences"
2014-04-01 20:25:17 +00:00
Fabrice Di Meglio
9593782d15
Add indexing for Notifications preferences
...
- also add indexing of CheckBoxPreferences
- also some code cleaning
Change-Id: I2943caaec3d64fb2a6be85168454fc76fe572afe
2014-04-01 13:21:01 -07:00
Baligh Uddin
61ac531286
am b89c4d71
: (-s ours) am cf743762
: (-s ours) am 88adaa72
: (-s ours) am 112916b5
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b89c4d713bd33072961ace7743d391ed6339d410':
Import translations. DO NOT MERGE
2014-04-01 01:25:38 +00:00
Fabrice Di Meglio
5ff8de7e4d
Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)."
2014-04-01 01:21:23 +00:00
Fabrice Di Meglio
0e1d4b0d1a
Fix bug #13727850 Input values are not visible when setting up the lockscreen...
...
...security(PIN/Passwor/Pattern).
- remove hardcoded colors...
- define a text appearance style for the password / pin
Change-Id: I425a2daa016cb782f18de320b5696d076f576600
2014-03-31 17:36:52 -07:00
Baligh Uddin
47d7f210f9
am b3545a54
: (-s ours) am 518a5037
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b3545a548fe336024dae011ac1c4e643d4f4b114':
Import translations. DO NOT MERGE
2014-04-01 00:24:35 +00:00
Baligh Uddin
b89c4d713b
am cf743762
: (-s ours) am 88adaa72
: (-s ours) am 112916b5
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cf743762611ceb918aabee179ef10f81ccc90aaf':
Import translations. DO NOT MERGE
2014-04-01 00:21:31 +00:00
Baligh Uddin
cf74376261
am 88adaa72
: (-s ours) am 112916b5
: (-s ours) Import translations. DO NOT MERGE
...
* commit '88adaa72a385c3199787ecd3dae826f25d38572d':
Import translations. DO NOT MERGE
2014-04-01 00:15:49 +00:00
Baligh Uddin
88adaa72a3
am 112916b5
: (-s ours) Import translations. DO NOT MERGE
...
* commit '112916b59634a86195880a1368d8d60a86f33188':
Import translations. DO NOT MERGE
2014-04-01 00:09:19 +00:00
Baligh Uddin
b3545a548f
am 518a5037
: (-s ours) Import translations. DO NOT MERGE
...
* commit '518a503740bcb900fe8a69c86f5826466f99ee6e':
Import translations. DO NOT MERGE
2014-04-01 00:08:46 +00:00
Baligh Uddin
d81233e94d
Merge "Import translations. DO NOT MERGE"
2014-03-31 22:15:05 +00:00
Baligh Uddin
b123c7a90a
Import translations. DO NOT MERGE
...
Change-Id: I40361b20546a4fa949b75623315040f0d32127fa
Auto-generated-cl: translation import
2014-03-31 14:47:58 -07:00
Baligh Uddin
518a503740
Import translations. DO NOT MERGE
...
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
2014-03-31 14:42:20 -07:00
Baligh Uddin
112916b596
Import translations. DO NOT MERGE
...
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
2014-03-31 14:40:25 -07:00
Adrian Roos
5954ff505f
Add initial trust agent settings
...
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.
Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
2014-03-31 23:00:51 +02:00
John Spurlock
3726525d50
Zen mode settings update.
...
- Fix master switch placement, hide search option.
- New text-based design for bucket configs.
- Automatically turn on = Never
- Still read-only.
Bug:13670014
Change-Id: I33e7614515cc4ce1ca957d922b844d4865e35c9a
2014-03-31 12:07:52 -04:00
John Spurlock
12acc58109
Fix NPE in notification settings.
...
Show/hide the apps category safely every time.
Default apps category to hidden to avoid startup blip.
Change-Id: I4c18c57754e5d0a6a73e7271844ff71c0a66ad8d
2014-03-31 11:04:26 -04:00
Fabrice Di Meglio
7784e3507d
Merge "Go Quantum Go!"
2014-03-29 01:49:03 +00:00
Fabrice Di Meglio
23f5447b02
Go Quantum Go!
...
- use the Quantum Theme light version
Change-Id: I81c40813b8fb59286a370bde33076cdcd73390e5
2014-03-28 18:48:05 -07:00
Lajos Molnar
a46650530f
Merge "Add temporary developer setting to use NuPlayer as default media player"
2014-03-28 23:15:42 +00:00
Fabrice Di Meglio
d37e0b6a45
Merge "Settings - update for new UI (no more Drawer)"
2014-03-28 23:08:21 +00:00
Fabrice Di Meglio
d25314d330
Settings - update for new UI (no more Drawer)
...
- follow the UX spec by no more using a Drawer
- the Dashboard is now a Fragment that contains the list of Headers
- the search results are also put into a Fragment that is replacing
the initial one (Dashboard or other) when expanding the SearchView
- use a SearchView for query input
- when tapping on a Header or a Search Result, re-launch Settings as
an Activity so that we are benefiting from the Activity stack for
UP affordance and BACK button
- manage UP affordance to show it only when needed
- move some Actions to the Menu in the ActionBar for allowing space
to the Search action and removing some clutter
- fix an issue with the Index and WiFiEnabler and their cached Context
that was not updated when there was a Configuration change
- simplify the SettingsActivity code by extracting some inner classes
Change-Id: I50b5f77bb44a7fade1886114dbbc820609a5e63d
2014-03-28 15:51:29 -07:00
John Spurlock
c6d4a7edc3
am ce1b22cf
: (-s ours) am c4231382
: DO NOT MERGE Settings: Implement new required method.
...
* commit 'ce1b22cf66b853ba834bf963ab8a6a45e829fd15':
DO NOT MERGE Settings: Implement new required method.
2014-03-28 19:07:37 +00:00
John Spurlock
ce1b22cf66
am c4231382
: DO NOT MERGE Settings: Implement new required method.
...
* commit 'c423138247857312a4ac6ad32cb482868315bd61':
DO NOT MERGE Settings: Implement new required method.
2014-03-28 19:01:12 +00:00
Dan Sandler
57e109935b
Merge "List apps that advertise notification settings."
2014-03-28 18:51:04 +00:00
Dan Sandler
b19460f4a1
List apps that advertise notification settings.
...
Apps that have a CATEGORY_NOTIFICATION_PREFERENCES +
CATEGORY_DEFAULT activity will be listed in notification
settings, with a convenient link to that activity so the
user can tweak those settings.
Change-Id: Idc97b2aee3f070225822ebee1ecbeab79e7b9c2d
2014-03-28 14:47:49 -04:00
Lajos Molnar
6b2f7c4471
Add temporary developer setting to use NuPlayer as default media player
...
Bug: 11784824
Change-Id: Id42cc40d08ada06ec9e57e24473f7f833bc90dca
2014-03-28 11:35:32 -07:00
John Spurlock
c423138247
DO NOT MERGE Settings: Implement new required method.
...
Only required since it uses the non-public version
of the api.
Bug:13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
2014-03-28 09:41:30 -04:00
John Spurlock
6a8919299f
Merge "Add switch to zen mode settings preference page."
2014-03-28 13:09:51 +00:00
John Spurlock
f3e32e3410
Merge "Settings: Implement new required method."
2014-03-28 13:08:59 +00:00
Baligh Uddin
abe81e7a8b
am 1df63dd8
: (-s ours) am 584ac4c5
: (-s ours) am f39672bf
: (-s ours) am 3a9b49f9
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1df63dd8afa947b9a0e1b1295d5bf042cb2aec3f':
Import translations. DO NOT MERGE
2014-03-27 23:17:00 +00:00
Baligh Uddin
1df63dd8af
am 584ac4c5
: (-s ours) am f39672bf
: (-s ours) am 3a9b49f9
: (-s ours) Import translations. DO NOT MERGE
...
* commit '584ac4c525d45dfdc61f3f9db746582622e2ab5b':
Import translations. DO NOT MERGE
2014-03-27 23:10:42 +00:00
Baligh Uddin
584ac4c525
am f39672bf
: (-s ours) am 3a9b49f9
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f39672bfac77a604a3a04484f7d88adc4ecf9c66':
Import translations. DO NOT MERGE
2014-03-27 23:05:03 +00:00
Baligh Uddin
140f3dff92
am 5c5bfbb0
: (-s ours) am 1dc01d10
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5c5bfbb048d5b92b095e974496a48cd3b7ff8baf':
Import translations. DO NOT MERGE
2014-03-27 22:26:39 +00:00
Baligh Uddin
5c5bfbb048
am 1dc01d10
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1dc01d10ddb19355dc21b6e677afcf33aa460136':
Import translations. DO NOT MERGE
2014-03-27 22:22:05 +00:00
Baligh Uddin
f39672bfac
am 3a9b49f9
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3a9b49f975df7c53e86dd795e21f904442c22a4a':
Import translations. DO NOT MERGE
2014-03-27 22:22:03 +00:00
Baligh Uddin
e0dbd4e42b
Merge "Import translations. DO NOT MERGE"
2014-03-27 21:48:36 +00:00
Nicholas Sauer
c33baa4294
Merge "Skip bluetooth device iteration if LocalBluetoothManager is null"
2014-03-27 21:37:19 +00:00
Nicholas Sauer
cb644cc2e7
Skip bluetooth device iteration if LocalBluetoothManager is null
...
bug:13653239
Change-Id: I163c47b626825b2f83bb63d9f6900216ce44ae41
2014-03-27 14:28:33 -07:00
John Spurlock
7f502bf824
Add switch to zen mode settings preference page.
...
Bug:13670014
Change-Id: Id45841818e2fe8f57b5db47df3b0add06be6967a
2014-03-27 10:21:04 -04:00
Amith Yamasani
c96ccc8585
Merge "Don't allow user creation on phones via Settings search"
2014-03-26 23:27:10 +00:00
Amith Yamasani
cfb8d7f3c8
Don't allow user creation on phones via Settings search
...
This screen was blocked from appearing in the main Settings list, but
search now exposes it.
Disable content on the Users screen if multiple users are not supported
on the device. This is a temporary fix until Settings search does the
right thing.
Bug: 13631986
Change-Id: Icc61d3e9ce4e405d0cf8841af538216be59fac26
2014-03-26 14:46:47 -07:00
Baligh Uddin
517f03606f
Import translations. DO NOT MERGE
...
Change-Id: If8a371ad883f5b1d685b551f781b7dd6c2698eba
Auto-generated-cl: translation import
2014-03-26 14:17:52 -07:00