Justin Harrison
c591cdd69b
am fa9d8258
: am 8a44f2c4
: am a3add1d2
: am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
Add color transform setting
2015-09-19 18:14:36 +00:00
Justin Harrison
fa9d8258d4
am 8a44f2c4
: am a3add1d2
: am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
Add color transform setting
2015-09-19 00:46:06 +00:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jorim Jaggi
cb9d7a96bb
resolved conflicts for 99bbec73
to master
...
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
2015-09-09 18:48:27 -07:00
Jorim Jaggi
99bbec733d
am f37368db
: am ef5f9e39
: am 48422b52
: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
...
* commit 'f37368db841ce534cc1712b54b1c88bcbe991756':
Add double-tap power button to open camera 2/2
2015-09-10 01:11:44 +00:00
Jorim Jaggi
cc1e9f7ce7
Add double-tap power button to open camera 2/2
...
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
2015-09-09 22:40:00 +00:00
Robin Lee
b5e37f1d45
Merge "Show installed user keys in Security Settings"
2015-09-08 16:03:26 +00:00
Xiaohui Chen
40aca2ceb4
Remove dead Nsd checkbox
...
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.
Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
2015-09-03 11:29:45 -07:00
Robin Lee
baefdcf9eb
Show installed user keys in Security Settings
...
This makes removing a particular keyset possible without deleting the
whole keystore along with it.
Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
2015-08-26 16:22:19 +01:00
Julia Reynolds
fcfe3d82d2
Merge "Switch font size from a dialog to dropdown preference."
2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d
Switch font size from a dialog to dropdown preference.
...
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
2015-08-13 10:40:29 -04:00
Dianne Hackborn
ca9433519b
am a0b5ab0e
: am cd2b9e12
: am 2be290cf
: am 6a1e1e08
: am f67d0785
: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 02:10:09 +00:00
Dianne Hackborn
a0b5ab0ef6
am cd2b9e12
: am 2be290cf
: am 6a1e1e08
: am f67d0785
: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:18:08 +00:00
Dianne Hackborn
6a1e1e08a0
am f67d0785
: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:54:31 +00:00
Dianne Hackborn
b9a8e277d9
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Todd Kennedy
c37a80990b
Merge "Add force external setting"
2015-08-12 16:53:32 +00:00
Jason Monk
fe7a25f8fe
am 1e29e6b9
: am 31227bfa
: am bce29c8a
: am 746886c5
: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
Add setting to disable camera gesture
2015-08-11 14:20:29 +00:00
Jason Monk
1e29e6b9ec
am 31227bfa
: am bce29c8a
: am 746886c5
: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '31227bfaf12ede192474bb162f1555215ffa605b':
Add setting to disable camera gesture
2015-08-11 14:12:00 +00:00
Todd Kennedy
97162821f9
Add force external setting
...
Adds a developer setting that overrides the package's storage
preference. This allows any [non-system] package to be moved
to external storage.
Bug: 22282121
Change-Id: Ie21bc13b1d92fe0972f789a2187e11d2e413f040
2015-08-10 09:50:28 -07:00
Jason Monk
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -04:00
Julia Reynolds
878aca754b
am 7ae0f3cd
: am a578d3af
: am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '7ae0f3cdf21811712527461d623c5699b96cf8a2':
Change 'data' label to 'data usage'.
2015-07-29 22:02:31 +00:00
Julia Reynolds
7ae0f3cdf2
am a578d3af
: am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit 'a578d3afe839247c24ee805852d7fdf12250607c':
Change 'data' label to 'data usage'.
2015-07-29 18:52:49 +00:00
Julia Reynolds
ff0e1650d9
Change 'data' label to 'data usage'.
...
Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
2015-07-29 13:15:14 -04:00
Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b
to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Jason Monk
769ba03b8f
am 0557f4c3
: am b46b9934
: am 6d8fdb82
: am 838c8432
: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00
Jason Monk
c2f431debe
am 97c68c18
: am 8e350e80
: am b48e56c9
: am 959a7380
: am 178c4099
: Merge "Handle monkey crash" into mnc-dev
...
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
Handle monkey crash
2015-07-21 00:14:01 +00:00
Jason Monk
97c68c181d
am 8e350e80
: am b48e56c9
: am 959a7380
: am 178c4099
: Merge "Handle monkey crash" into mnc-dev
...
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
Handle monkey crash
2015-07-20 21:38:07 +00:00
Jason Monk
178c40998d
Merge "Handle monkey crash" into mnc-dev
2015-07-20 20:32:29 +00:00
Christopher Tate
d2dcd30acd
am 99e89859
: am ef1961c7
: am 7cce6d0c
: am f330857a
: am b852fcbd
: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
Offer 'ask' as an available app-linking state
2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959
am ef1961c7
: am 7cce6d0c
: am f330857a
: am b852fcbd
: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
Offer 'ask' as an available app-linking state
2015-07-20 18:17:05 +00:00
Jason Monk
bd45c3cbe0
Handle monkey crash
...
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
2015-07-20 13:40:40 -04:00
Christopher Tate
b852fcbde9
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f
Offer 'ask' as an available app-linking state
...
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Julia Reynolds
7c5f0e18cc
am 406b1b9f
: am 98f81284
: am 03b1b4f3
: am 8560ae2f
: am 0c03b50a
: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '406b1b9f204e769181901a2c157b026971e902fb':
Remove blank switchtext from switch preferences.
2015-07-17 21:21:48 +00:00
Julia Reynolds
406b1b9f20
am 98f81284
: am 03b1b4f3
: am 8560ae2f
: am 0c03b50a
: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
Remove blank switchtext from switch preferences.
2015-07-17 21:07:35 +00:00
Jason Monk
b1d9536e58
Remove tuner from development settings
...
It has a new home now.
Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Jason Monk
4904f3cbaf
am bfa8e5d5
: am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
Change move storage from dropdown pref to dialog
2015-07-16 00:04:43 +00:00
Jason Monk
bfa8e5d53b
am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
Change move storage from dropdown pref to dialog
2015-07-15 23:48:20 +00:00
Jason Monk
e8400c2fb7
Change move storage from dropdown pref to dialog
...
Use a horizontal pref and a single button that triggers the dialog
Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Billy Lau
5742b87e5c
am 509f2fe5
: am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:39:17 +00:00
Billy Lau
509f2fe51c
am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:23:52 +00:00
Billy Lau
7f70ba18e6
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
...
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Jason Monk
d31d204958
am e86de04d
: am a992bb3d
: am 6799ef42
: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'e86de04dd6f409fd738063109e66f66ac7c17119':
Reduce jank in wifi settings
2015-06-30 14:32:33 +00:00
Jason Monk
e86de04dd6
am a992bb3d
: am 6799ef42
: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
Reduce jank in wifi settings
2015-06-30 14:21:05 +00:00
Jason Monk
6799ef423b
Merge "Reduce jank in wifi settings" into mnc-dev
2015-06-30 14:03:05 +00:00
Jorim Jaggi
0f4f09c3d3
am 6c8e6503
: am ea53bfcd
: am d9bd96b3
: Add setting to disable screenshot separately (2/2)
...
* commit '6c8e6503084845b8923b9a63c300c8f6e3dd519c':
Add setting to disable screenshot separately (2/2)
2015-06-30 01:01:18 +00:00
Jorim Jaggi
6c8e650308
am ea53bfcd
: am d9bd96b3
: Add setting to disable screenshot separately (2/2)
...
* commit 'ea53bfcddf8c8b37a154bcbdcbbec2ee71b109d9':
Add setting to disable screenshot separately (2/2)
2015-06-30 00:49:24 +00:00
Jorim Jaggi
d9bd96b309
Add setting to disable screenshot separately (2/2)
...
Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
2015-06-29 14:50:45 -07:00