Steve Pfetsch
5ff50f2072
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
...
am: 76b29667df
* commit '76b29667dff7b27151e450a05838913971f93c8f':
Added toast message to color temperature setting
2016-01-22 22:21:34 +00:00
Steve Pfetsch
76b29667df
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
2016-01-22 22:07:54 +00:00
Steve Pfetsch
8897655d2e
Added toast message to color temperature setting
...
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.
Bug:26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
2016-01-21 10:44:51 -08:00
Geoff Mendal
97898c5cd2
Import translations. DO NOT MERGE
...
am: ffb0eb03a7
-s ours
* commit 'ffb0eb03a729758c6477a701c07f39121ee95872':
Import translations. DO NOT MERGE
2016-01-20 17:41:58 +00:00
Geoff Mendal
bcefb0397f
Import translations. DO NOT MERGE
...
Change-Id: Icfc8542b0e1f51163d9ff7f5327e851a08377d67
Auto-generated-cl: translation import
2016-01-20 07:40:11 -08:00
Geoff Mendal
ffb0eb03a7
Import translations. DO NOT MERGE
...
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
2016-01-20 07:31:39 -08:00
Geoff Mendal
550dd6e8dc
Import translations. DO NOT MERGE
...
am: c123a6a923
-s ours
* commit 'c123a6a9230faf4800df67085b98bcd7badf4ca8':
Import translations. DO NOT MERGE
2016-01-18 15:41:49 +00:00
Geoff Mendal
bd620a7de1
Import translations. DO NOT MERGE
...
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
2016-01-18 07:40:39 -08:00
Geoff Mendal
c123a6a923
Import translations. DO NOT MERGE
...
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
2016-01-18 07:32:09 -08:00
Steve Pfetsch
979a32e6e3
Enable color temperature developer setting
...
am: ab5da2d2fe
* commit 'ab5da2d2fe0b02a7cdf5f4d78d24583b2542d213':
Enable color temperature developer setting
2016-01-15 20:42:18 +00:00
Steve Pfetsch
ab5da2d2fe
Enable color temperature developer setting
...
Add a switch in Developer Settings to enable "cool" color temperature
mode.
Bug: 26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
2016-01-14 15:19:05 -08:00
Justin Harrison
9f6cb40ebc
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
...
am: 0c38aca074
* commit '0c38aca074d0e069eb214abc91eeb024b5121b73':
Add strings for color temperature developer option
2016-01-14 02:04:47 +00:00
Justin Harrison
0c38aca074
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
2016-01-14 01:56:42 +00:00
Steve Pfetsch
63e40965bb
Add strings for color temperature developer option
...
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug: 26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
2016-01-13 15:59:43 -08:00
Geoff Mendal
b8d0b5323b
Import translations. DO NOT MERGE am: 6a52aca8ea
-s ours am: 21e3d54adc
-s ours am: b994c93600
-s ours
...
am: 0fc4bed550
-s ours
* commit '0fc4bed5503136cbd8bd474c33901a2ce9a98eae':
Import translations. DO NOT MERGE
2016-01-13 01:12:12 +00:00
Geoff Mendal
0fc4bed550
Import translations. DO NOT MERGE am: 6a52aca8ea
-s ours am: 21e3d54adc
-s ours
...
am: b994c93600
-s ours
* commit 'b994c936002bacf9d6fe314f9ebef3432a58dd6c':
Import translations. DO NOT MERGE
2016-01-13 01:10:08 +00:00
Geoff Mendal
b994c93600
Import translations. DO NOT MERGE am: 6a52aca8ea
-s ours
...
am: 21e3d54adc
-s ours
* commit '21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc
Import translations. DO NOT MERGE
...
am: 6a52aca8ea
-s ours
* commit '6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
2016-01-13 01:05:38 +00:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08:00
Sungmin Choi
6a4d214ed6
Select or not Wi-Fi Calling preference as CarrierConfig
...
am: 577add865a
* commit '577add865a0ca3d225b0fdc248b099ea05984a75':
Select or not Wi-Fi Calling preference as CarrierConfig
2016-01-11 20:31:22 +00:00
Sungmin Choi
577add865a
Select or not Wi-Fi Calling preference as CarrierConfig
...
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.
Bug: 26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
2016-01-11 11:06:41 -08:00
Svetoslav
6e88d0b02f
DO NOT MERGE Modify system settings: incorrect UI state
...
am: 119d589ea5
* commit '119d589ea5aa9c2ccc5164279d718a20d0865f20':
DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 19:42:06 +00:00
Svetoslav
119d589ea5
DO NOT MERGE Modify system settings: incorrect UI state
...
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d
)
2015-12-22 19:38:30 +00:00
Geoff Mendal
ab3b13d0ed
Import translations. DO NOT MERGE
...
am: 1cb1ad2c55
-s ours
* commit '1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
Import translations. DO NOT MERGE
2015-12-11 18:04:00 -08:00
Geoff Mendal
1cb1ad2c55
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
2015-12-11 17:58:32 -08:00
Geoff Mendal
d2981b099e
Revert "Import translations. DO NOT MERGE"
...
am: 7bafd5ee2f
-s ours
* commit '7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
Revert "Import translations. DO NOT MERGE"
2015-12-11 17:44:31 -08:00
Geoff Mendal
7bafd5ee2f
Revert "Import translations. DO NOT MERGE"
...
This reverts commit df57be8aef
.
Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
2015-12-12 01:42:00 +00:00
Geoff Mendal
bc84451452
Import translations. DO NOT MERGE
...
am: df57be8aef
-s ours
* commit 'df57be8aef6dd1760e72d7f76490048eeb425a3e':
Import translations. DO NOT MERGE
2015-12-11 16:30:09 -08:00
Geoff Mendal
df57be8aef
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
2015-12-11 16:05:26 -08:00
Hyejin Kim
c46bbd6373
Add IMS settings to Network setting reset
...
am: 623852f6c7
* commit '623852f6c772b7685abade493b304da1f71b4c00':
Add IMS settings to Network setting reset
2015-12-06 18:37:50 +00:00
Hyejin Kim
623852f6c7
Add IMS settings to Network setting reset
...
Add the factory reset function to be used to reset IMS settings
BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-01 10:59:25 -08:00
Geoff Mendal
bdbd6da522
Import translations. DO NOT MERGE am: 2102350ea3
-s ours am: 75dd183bf7
-s ours am: 74e9c3d348
-s ours
...
am: 39be1461a8
-s ours
* commit '39be1461a876a4442e11dc26cff14ec80273baf0':
Import translations. DO NOT MERGE
2015-11-20 01:24:46 +00:00
Geoff Mendal
39be1461a8
Import translations. DO NOT MERGE am: 2102350ea3
-s ours am: 75dd183bf7
-s ours
...
am: 74e9c3d348
-s ours
* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348
Import translations. DO NOT MERGE am: 2102350ea3
-s ours
...
am: 75dd183bf7
-s ours
* commit '75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7
Import translations. DO NOT MERGE
...
am: 2102350ea3
-s ours
* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
ebc5086d15
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
am: 5950ff1d69
am: 2b29501039
...
am: f0d538f08d
* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
Block developer settings during SUW
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours am: 439033dd93
am: 38e932dc81
...
am: 8199c3028c
* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
am: 5950ff1d69
...
am: 2b29501039
* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
Block developer settings during SUW
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours am: 439033dd93
...
am: 38e932dc81
* commit '38e932dc816fe7aff6443bfa5648743f527aa097':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
...
am: 5950ff1d69
* commit '5950ff1d69ca27c09569f40862201ede261c831e':
Block developer settings during SUW
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours
...
am: 439033dd93
* commit '439033dd93417b98acff392865166503a507ff30':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
...
am: 8e4f6fbc2e
* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
...
am: 6967df6421
-s ours
* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
6a7ff3186b
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
am: 2075d98be6
...
am: 7d44fe6fdb
* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
Preserve FRP lock if wiped during SUW
2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00