OSDN Git Service
Geoff Mendal [Mon, 1 Feb 2016 15:33:16 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I807c37bd4191712a2408d46f35cf88caf72f1f75
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Jan 2016 16:22:12 +0000 (16:22 +0000)]
Import translations. DO NOT MERGE
am:
963c4b3d41 -s ours
* commit '
963c4b3d41c872404e84d469b213cd5a84d6d3ec':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 15:34:25 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I528d633660acacb4ed8a3f1d6bf2b35b3ce3170d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Jan 2016 15:25:34 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:34:18 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 25 Jan 2016 15:32:50 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:30:39 +0000 (15:30 +0000)]
Import translations. DO NOT MERGE
am:
13391af4fc -s ours
* commit '
13391af4fc4d095d2c94b388e441e34645ef7f68':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:24:17 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
Steve Pfetsch [Fri, 22 Jan 2016 22:21:34 +0000 (22:21 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
am:
76b29667df
* commit '
76b29667dff7b27151e450a05838913971f93c8f':
Added toast message to color temperature setting
Steve Pfetsch [Fri, 22 Jan 2016 22:07:54 +0000 (22:07 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
Steve Pfetsch [Thu, 21 Jan 2016 01:48:13 +0000 (17:48 -0800)]
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
Geoff Mendal [Wed, 20 Jan 2016 17:41:58 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE
am:
ffb0eb03a7 -s ours
* commit '
ffb0eb03a729758c6477a701c07f39121ee95872':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 15:40:11 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfc8542b0e1f51163d9ff7f5327e851a08377d67
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 15:31:39 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:41:49 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
c123a6a923 -s ours
* commit '
c123a6a9230faf4800df67085b98bcd7badf4ca8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:40:39 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:32:09 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
Steve Pfetsch [Fri, 15 Jan 2016 20:42:18 +0000 (20:42 +0000)]
Enable color temperature developer setting
am:
ab5da2d2fe
* commit '
ab5da2d2fe0b02a7cdf5f4d78d24583b2542d213':
Enable color temperature developer setting
Steve Pfetsch [Thu, 14 Jan 2016 01:07:35 +0000 (17:07 -0800)]
Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.
Bug:
26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
Justin Harrison [Thu, 14 Jan 2016 02:04:47 +0000 (02:04 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
am:
0c38aca074
* commit '
0c38aca074d0e069eb214abc91eeb024b5121b73':
Add strings for color temperature developer option
Justin Harrison [Thu, 14 Jan 2016 01:56:42 +0000 (01:56 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
Steve Pfetsch [Wed, 13 Jan 2016 23:22:56 +0000 (15:22 -0800)]
Add strings for color temperature developer option
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug:
26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
Geoff Mendal [Wed, 13 Jan 2016 01:12:12 +0000 (01:12 +0000)]
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
Geoff Mendal [Wed, 13 Jan 2016 01:10:08 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours
am:
b994c93600 -s ours
* commit '
b994c936002bacf9d6fe314f9ebef3432a58dd6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:07:32 +0000 (01:07 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours
am:
21e3d54adc -s ours
* commit '
21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:05:38 +0000 (01:05 +0000)]
Import translations. DO NOT MERGE
am:
6a52aca8ea -s ours
* commit '
6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
Sungmin Choi [Mon, 11 Jan 2016 20:31:22 +0000 (20:31 +0000)]
Select or not Wi-Fi Calling preference as CarrierConfig
am:
577add865a
* commit '
577add865a0ca3d225b0fdc248b099ea05984a75':
Select or not Wi-Fi Calling preference as CarrierConfig
Sungmin Choi [Wed, 23 Dec 2015 05:24:52 +0000 (14:24 +0900)]
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
Svetoslav [Tue, 22 Dec 2015 19:42:06 +0000 (19:42 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
119d589ea5
* commit '
119d589ea5aa9c2ccc5164279d718a20d0865f20':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
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
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
Geoff Mendal [Sat, 12 Dec 2015 02:04:00 +0000 (18:04 -0800)]
Import translations. DO NOT MERGE
am:
1cb1ad2c55 -s ours
* commit '
1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 01:58:32 +0000 (17:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
Geoff Mendal [Sat, 12 Dec 2015 01:44:31 +0000 (17:44 -0800)]
Revert "Import translations. DO NOT MERGE"
am:
7bafd5ee2f -s ours
* commit '
7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 01:42:00 +0000 (01:42 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
df57be8aef6dd1760e72d7f76490048eeb425a3e.
Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
Geoff Mendal [Sat, 12 Dec 2015 00:30:09 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE
am:
df57be8aef -s ours
* commit '
df57be8aef6dd1760e72d7f76490048eeb425a3e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 00:05:26 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
Hyejin Kim [Sun, 6 Dec 2015 18:37:50 +0000 (18:37 +0000)]
Add IMS settings to Network setting reset
am:
623852f6c7
* commit '
623852f6c772b7685abade493b304da1f71b4c00':
Add IMS settings to Network setting reset
Hyejin Kim [Thu, 5 Nov 2015 03:35:39 +0000 (12:35 +0900)]
Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings
BUG=
25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
Geoff Mendal [Fri, 20 Nov 2015 01:24:46 +0000 (01:24 +0000)]
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
Geoff Mendal [Fri, 20 Nov 2015 01:19:50 +0000 (01:19 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours
am:
74e9c3d348 -s ours
* commit '
74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:14:23 +0000 (01:14 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours
am:
75dd183bf7 -s ours
* commit '
75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:09:14 +0000 (01:09 +0000)]
Import translations. DO NOT MERGE
am:
2102350ea3 -s ours
* commit '
2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 00:58:46 +0000 (16:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
Russell Brenner [Tue, 17 Nov 2015 20:32:03 +0000 (20:32 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 20:23:22 +0000 (20:23 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:23:06 +0000 (20:23 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 20:14:22 +0000 (20:14 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:14:10 +0000 (20:14 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b
am:
8e4f6fbc2e
* commit '
8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:05:43 +0000 (20:05 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 19:57:00 +0000 (19:57 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed
am:
afe5eada5b
* commit '
afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:56:48 +0000 (19:56 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 19:53:17 +0000 (19:53 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
am:
56d630a3ed
* commit '
56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:51:09 +0000 (19:51 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am:
14bf226c79
* commit '
14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:37:51 +0000 (01:37 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de
am:
2075d98be6
* commit '
2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am:
f0ff1631de
* commit '
f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
Sanket Padawe [Tue, 17 Nov 2015 01:22:25 +0000 (01:22 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2
am:
773b8a3c44
* commit '
773b8a3c4422ab9daf7adb62895568852b43882e':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Tue, 17 Nov 2015 01:16:41 +0000 (01:16 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4
am:
28eca8e8c2
* commit '
28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
Uncheck checkbox for contact sharing by default for non carkit devices.
Russell Brenner [Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
Russell Brenner [Tue, 17 Nov 2015 01:13:55 +0000 (01:13 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
Sanket Padawe [Tue, 17 Nov 2015 01:12:09 +0000 (01:12 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices.
am:
98f11fd1a4
* commit '
98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
Uncheck checkbox for contact sharing by default for non carkit devices.
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug:
25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug:
25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
Sanket Padawe [Fri, 13 Nov 2015 00:02:30 +0000 (00:02 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
dbc47fb262
am:
0ad16831ee
* commit '
0ad16831ee2e2029a0fc2891c8007505bb9779cd':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Thu, 12 Nov 2015 23:57:48 +0000 (23:57 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices.
am:
dbc47fb262
* commit '
dbc47fb262a4273417d99dabab757854aa3b0eaf':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
Uncheck checkbox for contact sharing by default for non carkit devices.
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug:
23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit
dbc47fb262a4273417d99dabab757854aa3b0eaf)
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
Uncheck checkbox for contact sharing by default for non carkit devices.
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug:
23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
Block developer settings during SUW
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug:
25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
Jason Monk [Mon, 9 Nov 2015 22:36:21 +0000 (22:36 +0000)]
Null check queryIntentServices am:
a4c9492b50
am:
e27cada8c4
* commit '
e27cada8c49c8aec2463c352faf5211502b1b372':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:31:51 +0000 (22:31 +0000)]
Null check queryIntentServices
am:
a4c9492b50
* commit '
a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 21:56:46 +0000 (16:56 -0500)]
Null check queryIntentServices
Bug:
25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
Dianne Hackborn [Fri, 30 Oct 2015 17:24:34 +0000 (17:24 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d
am:
a42bad972c
* commit '
a42bad972ca44f52ac84b3139198acc11dec0d4f':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:20:13 +0000 (17:20 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
3b4e4dd91d
* commit '
3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:16:20 +0000 (17:16 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Fri, 30 Oct 2015 00:32:28 +0000 (17:32 -0700)]
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
Dianne Hackborn [Thu, 29 Oct 2015 23:43:04 +0000 (23:43 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076
am:
68954d930d
* commit '
68954d930d0a583c7150e1a3959d5a798b8e5f34':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
508559d076
* commit '
508559d0760596509f07fa56371c6e18d8bd9559':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:36:14 +0000 (23:36 +0000)]
Merge "Fix issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Thu, 29 Oct 2015 20:34:51 +0000 (13:34 -0700)]
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
Geoff Mendal [Wed, 28 Oct 2015 14:05:28 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours
am:
04817defc9 -s ours
* commit '
04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:00:31 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
260d90a102 -s ours
* commit '
260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:55:41 +0000 (08:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 14:17:02 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours
am:
884a8bbe78 -s ours
* commit '
884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:13:23 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE
am:
c338bacb59 -s ours
* commit '
c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf
am:
34d6ea560d
* commit '
34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]
Fix crash in Settings from uninstall
am:
6e2e8e17cf
* commit '
6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Geoff Mendal [Wed, 21 Oct 2015 14:59:01 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours
am:
f3ad526200 -s ours
* commit '
f3ad5262003947120243736851ff5dce7ae7635a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:48:15 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE
am:
a489856def -s ours
* commit '
a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
Jason Monk [Wed, 21 Oct 2015 01:46:11 +0000 (01:46 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84
am:
6fde534148
* commit '
6fde534148c3f93b6362d4927270f81048a6bef3':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 01:43:06 +0000 (01:43 +0000)]
Allow access to permissions, even if app has none
am:
36866c8e84
* commit '
36866c8e84acd26e82b072f2d39106d0e58e6a84':
Allow access to permissions, even if app has none
Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]
Allow access to permissions, even if app has none
Bug:
24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
Michael Wright [Tue, 20 Oct 2015 17:54:53 +0000 (17:54 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
Michael Wright [Tue, 20 Oct 2015 17:54:46 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.
Michael Wright [Tue, 20 Oct 2015 17:54:29 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.