OSDN Git Service
Roman Birg [Thu, 8 Jan 2015 22:02:24 +0000 (14:02 -0800)]
Settings: select text when editing name
Makes it easier to rename them.
Change-Id: I63f7b7ce393acec8ebf8ae937434bd830e9e5128
Signed-off-by: Roman Birg <roman@cyngn.com>
Roman Birg [Thu, 8 Jan 2015 21:58:14 +0000 (13:58 -0800)]
Settings: add a way to fill a profile from the current device state
Change-Id: Ied5746f771bf7f9275c36e56b574a1c92473662c
Signed-off-by: Roman Birg <roman@cyngn.com>
Roman Birg [Wed, 7 Jan 2015 19:31:03 +0000 (11:31 -0800)]
Settings: add delete confirmation dialog for profiles
Change-Id: I22744bb55e2800e6ad3d7d6a164df6e5024e15ca
Signed-off-by: Roman Birg <roman@cyngn.com>
Roman Birg [Wed, 7 Jan 2015 01:20:27 +0000 (17:20 -0800)]
Settings: display Triggers inline with Profile actions
* Tapping them will open the proper trigger page
* Removed triggers icon
Change-Id: I9ea9c22eea7f3370f4c96519b83f6f83cdebaf88
Signed-off-by: Roman Birg <roman@cyngn.com>
Altaf-Mahdi [Mon, 15 Dec 2014 22:00:57 +0000 (22:00 +0000)]
Profiles: update text style to match Settings
-CategoryTitle for headers
-Material.Subhead for titles
-Material.Body1 for summaries
-fix some padding in abstract_trigger_row
-use ic_wifi_signal_4_teal for wifi icons
https://www.dropbox.com/s/mm8aiz44gvpsdlq/Screenshot_2014-12-15-21-54-45.png?dl=0
https://www.dropbox.com/s/z89en7orfup4b55/Screenshot_2014-12-15-21-54-55.png?dl=0
Change-Id: I5e9b77ba056220f0b82a92b2ff46c0f73d0b911b
blunden [Sat, 6 Dec 2014 19:55:41 +0000 (20:55 +0100)]
Update Profiles settings icon
Switch to vector drawables to fix blurry drawables
Change-Id: Id3f5e3ad408c4d17659d941f68853379b07c688f
Diogo Ferreira [Thu, 4 Dec 2014 15:13:28 +0000 (15:13 +0000)]
profiles: Make the floating action button more material-y
This makes the FAB look consistent with other fabs across the system,
it adds animated elevation, changes the icon color to white but mainly
fixes the size which was completly wrong.
Change-Id: Ib8b2d54869a6a10958c24bcc0fab1224fd07fadd
Roman Birg [Wed, 17 Sep 2014 17:37:05 +0000 (10:37 -0700)]
Settings: squash of new profile UI for cm-12.0
Additions for cm-12.0:
- removed expanded desktop
- added add profile FAB
- updated tabs for meterial style
- added enabler switch bar
Squashed commits:
-------------------------------
Settings: refactor Profiles to be more user friendly
* Remove the notion of Profile app groups
* Rearrange profile setup flow, now we first present the user with ways
which will trigger the profile, then allow them to set what happens when
the profile is triggered.
Change-Id: I2870df894046cd43c21c67991fb5efc9c3fec837
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: cleanup new profiles UI
* cleanup old code
* for configuring profiles, add options to modify triggers and remove
the profile
* remove separate activity
* don't hardcode padding pixel sizes
Change-Id: I6b1d05c9f918714249411006c7562496e2a7539e
Signed-off-by: Roman Birg <roman@cyngn.com>
Profiles: fix expanded desktop settings not applying
Change-Id: Ia523145bf47bfc189c29b035ad5ec6e053cf9296
Settings: Fix profiles volume override summary.
Change-Id: I499cfb3006a7fc7b5e931ac854a7437f5d141523
Settings: fix Profiles expanded desktop choice mapping
Change-Id: Ib96811a0c268ca68a7b9732283c5abc142d143a4
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: add "Untouched" ring mode option in profiles
Change-Id: I4ac2d63119b328533217104a799cb0660ecddfb9
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: profiles: fix volume streams override behavior
Before we would always assume to override the stream, but that is not
always the case. Add a checkbox to turn the override on and off.
Signed-off-by: Roman Birg <roman@cyngn.com>
Change-Id: Ic1a58d59a9e514d4c2ccf376191ac7989bbead26
Abhisek Devkota [Wed, 3 Dec 2014 00:12:29 +0000 (16:12 -0800)]
Rename Profiles to System profiles
L includes 'Users & Profiles', rename ours to distinguish features
and prevent confusion.
Change-Id: I5a148dcf5fea1b24448d254105b0bd6904a4ddd8
Danny Baumann [Thu, 13 Nov 2014 01:14:27 +0000 (17:14 -0800)]
Profiles : Settings
Change-Id: I072758a1c5ec04ef34077551220b6611068fe71d
Andy Mast [Sat, 12 Apr 2014 03:29:20 +0000 (20:29 -0700)]
Themes: Port to CM13 [3/3]
Change-Id: Ia8e852e5e5ad2465d0b9b73f16c7080a7337bb8a
Michael Bestas [Sat, 24 Oct 2015 11:13:25 +0000 (14:13 +0300)]
Set default date as untranslatable
Change-Id: Ibefcac482ecb4cfc5aa263bd0986efa9c7fd8e50
Michael Bestas [Sat, 24 Oct 2015 11:01:04 +0000 (14:01 +0300)]
Fix mismerge of root access preference
Change-Id: I05bfbd83de586e934dd5ba9fc766287c16daf9d7
Chirayu Desai [Wed, 26 Dec 2012 06:03:38 +0000 (11:33 +0530)]
One does not simply become a Developer
Also contains:
From
2622e3cddd08448666fcfd584a8794727e1b2979 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Wed, 2 Jul 2014 16:32:03 +0300
Subject: [PATCH] Fix translatability of modified dev countdown strings
Change-Id: I64ab4d7ab9d8334275d2e4d493b716a8fc73ab4e
Justin White [Tue, 10 Jan 2012 03:54:53 +0000 (22:54 -0500)]
Added build date (ro.build.date from build.prop) to device info.
Change-Id: I5e19ee04de5c26822e171d4af8f4bfc052be9b74
Chris Soyars [Sun, 19 Dec 2010 22:26:58 +0000 (17:26 -0500)]
Add Modver to Settings.
Change-Id: I596064a80210517ff0dae30401f71b52adabd614
Rename modversion
Change-Id: I6557d5aa68a3ad00166cdd2b8951f425ad7800df
DeviceInfoSettings: Use ro.cm.display.version instead of ro.cm.version
Follows the same logic as ro.build.display.id/ro.build.id:
engineering, debug and unsigned builds will have no distinction,
user and signed builds will show a simplified version
Change-Id: I713ccb2445ea2e333e831129ef7733fd518282eb
settings: This is CyanogenMod!
Change-Id: If9f14d6579b18c4ae049d35e312dd2d98746aced
Change-Id: I6557d5aa68a3ad00166cdd2b8951f425ad7800df
Norris, Ryan [Wed, 21 Oct 2015 22:32:54 +0000 (16:32 -0600)]
Settings: Fix duplicate entry.
In Change-Id If96219d893c0dfdcf4ad36e1cd8de3a413db0e8b,
updateUSBAudioOptions(); is in line 630 while it should be
updateRootAccessOptions();.
Change-Id: Ibeea761aa7f7619ddce5154e292750f080ca7af3
Steve Kondik [Wed, 21 Oct 2015 23:50:12 +0000 (16:50 -0700)]
Merge branch 'm' of git://codeaurora.org/platform/packages/apps/Settings into cm-13.0
Steve Kondik [Mon, 19 Oct 2015 06:46:41 +0000 (23:46 -0700)]
settings: Add developer setting for root access
Change-Id: If96219d893c0dfdcf4ad36e1cd8de3a413db0e8b
Hemant Gupta [Tue, 22 Sep 2015 20:58:56 +0000 (13:58 -0700)]
Bluetooth: Remove notification once device is bonded
This change removes the pairing notification once the
bonding process is successfully completed. This scenario
is specific to the cases where external apps set the Pin
Key while bonding and the pairing popups or the notifications
that are generated by the Settings apk need to be removed
at the end of successful pairing or a failed bond.
CRs-Fixed: 914262
Change-Id: I11ce77e257dcc957d7074b544da777dbdba0b3b1
Linux Build Service Account [Mon, 12 Oct 2015 11:20:24 +0000 (04:20 -0700)]
Merge "Customize regulatory info."
Linux Build Service Account [Mon, 12 Oct 2015 11:20:21 +0000 (04:20 -0700)]
Merge "Bluetooth: Add Manifest configure to fix settings crash issue."
Matadeen Mishra [Thu, 1 Oct 2015 12:00:16 +0000 (17:30 +0530)]
Bluetooth: Add Manifest configure to fix settings crash issue.
Settings is crashed when press back key after rotating screen when
Bluetooth profile activity is opened. Add manifest configure to
enable screen orientation feature.
Settings: Change the text size of title when rotate screen
The text size of bluetooth settings' title is not changed when
rotate the screen.
According to the configuration, change the text size of title.
Change-Id: I3f08d0dd8181ffc8999ed29ac31dcc19a7dd56e9
CRs-Fixed: 917010
Shaoxu Liu [Thu, 8 Oct 2015 07:15:27 +0000 (15:15 +0800)]
Customize regulatory info.
Since the AndroidManifest could not use the overlay boolean,
enable the regulatory info in AndroidManifest.
Add flag checking to make sure it could be customized to enable
or disable.
Change-Id: I95018d94dea271eed9d740b356ad883c0b537e28
Umashankar Godachi [Wed, 9 Sep 2015 08:24:52 +0000 (13:54 +0530)]
Fix to show both voice and data service state under sim status settings
Only voice registration state value was considered to show Service state
under phone settings. This was confusing when data is registered on the
device and signal strength icon is shown but voice reg state will be OOS.
Fix: Showing both voice and data registration states under "Service state"
Change-Id: Iffdf3a074845427877e9f350aeb0e7a53bfe8e1e
CRs-Fixed: 822051.
Susheel nyamala [Thu, 10 Sep 2015 14:32:43 +0000 (20:02 +0530)]
Fix apn population issue
With Uicc card, when device is camped for eHRPD network,
mcc-mnc values populated on APN editor are wrong.
This is because the icc property used to read mcc-mnc is
updated with mcc-mnc value from RuimRecords.
Fix is to get family type from PS RAT and read mcc-mnc value
from icc records obtained from RAT family type
Change-Id: I42cde5c6acfcc08f1ce5e8a1f0d4830aafe93351
CRs-Fixed: 727780
Sridhar Dubbaka [Fri, 25 Sep 2015 18:57:26 +0000 (00:27 +0530)]
Telephony(MSIM): Add Sms Prompt support
In Msim, Whenver user selects Ask every time option in Sim settings,
Mms app will prompt for slection of sub from
composemessageactivity, on which SMS to be sent.
Change-Id: I39b1e1e3963779c717ea2aa49de94b6f0088984b
Prasath Balakrishnan [Mon, 28 Sep 2015 14:51:27 +0000 (20:21 +0530)]
Settings: Display 14 digit IMEI(Ignore Check Digit)
Show 14 digit IMEI instead of 15 digit based on the
config (ignore check digit)
Change-Id: I2bdfb61ad2964cdae7175f0aaa9da53a5ac2642a
CRs-Fixed: 808534
Sravanthi Palakonda [Thu, 10 Sep 2015 11:52:21 +0000 (17:22 +0530)]
Wifi: Enhance EAP SIM/AKA/AKA` configuration for multi(dual ) sim
This commit enhances the user interface by having the provision to
perform EAP authentication on a specific SIM , when the DUT is enabled
with multi (dual) SIM.
Change-Id: I4095d235750c2a46ab33a99f5f4f3937b6d5e314
CRs-Fixed: 905749
Sooraj Sasindran [Mon, 21 Sep 2015 21:52:52 +0000 (14:52 -0700)]
MSIM: Display SIM info even if APM is on
If device is in APM, then display the sim info and disable
button to activate/deactivate sim.
CRs-Fixed: 910841
Change-Id: Id4726f9f45eab2b813d7d4a448d9edae4a1bfe2e
Sandeep Gutta [Mon, 14 Sep 2015 14:44:07 +0000 (20:14 +0530)]
Telephony(MSIM): Select preferred primary sub.
Add UI to select preferred primary sub.
It is used when two SIM cards inserted have same
priority as per policy.
Change-Id: I5726fe9f4df03e680dc2406854d08da77297444d
Sandeep Gutta [Sun, 13 Sep 2015 16:39:23 +0000 (22:09 +0530)]
Telephony(MSIM): Fix to do not allow both SIM deactivation
Use proper SubInfo record object to do not allow
user to deactivate both SIMs on DSDS devices.
Change-Id: I6f56d819367272b3a009c7a8133709c643e8bd84
CRs-Fixed: 893504
Matadeen Mishra [Tue, 8 Sep 2015 04:53:43 +0000 (10:23 +0530)]
Settings App: Fix to resolve NULL pointer exceptions
This fix resolves any NULL pointer exceptions and
Array Index Out of Bounds exceptions seen in
Settings Application code space.
Change-Id: Ib478a1460910a2eb34b308c94cec9817bab93b34
CRs-Fixed: 908156
Bhavna Sharma [Sat, 1 Aug 2015 01:30:41 +0000 (18:30 -0700)]
Show EULA consent option based on presence of GMS
EULA consent option is location settings page must
be shown only if GMS packages are present.
CRs-Fixed: 901866
Change-Id: Iec731c92fbd405fbbe7f713b8c301e8393bbc083
Sridhar Dubbaka [Tue, 8 Sep 2015 11:23:08 +0000 (16:53 +0530)]
Update Signal strength with data registration also into consideration.
When Voice is out of service and data is registered, Signal strength
showing as 0 in sim Settings.
Fix: Consider data registration state also while updating
signal strength.
Change-Id: I5b5175e6307ac73f72adf8bfa7afe6dc9b4ac958
Nalla Kartheek [Thu, 3 Sep 2015 11:29:21 +0000 (16:59 +0530)]
P2P: Set station disconnected state scan interval when P2P connected
When P2P is in connected state, and station is in disconnected state,
framework issues SCAN with an interval which shall be configured using
global flag WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS. Set this flag
default to three minutes, to improve throughput.
Change-Id: I95a937d74da222432c73462657e4e97473bb6532
CRs-Fixed: 901633
Suresh Koleti [Mon, 27 Jul 2015 11:44:14 +0000 (17:14 +0530)]
IMS: Make wifi call settings UI non indexable
- Visibility of wifi calling settings option is controlled
with isWfcEnabledByPlatform.
- Make wifi calling settings UI non indexable when UI option
is removed.
Change-Id: Ie5bdbdde5d17582eceeee07c2d5ee9fb361e00bc
CRs-Fixed: 877308
Amit Blay [Tue, 1 Sep 2015 14:47:18 +0000 (17:47 +0300)]
Modified the behavior of encryption failure, when MDTP is activated
If MDTP is activated the device will be wiped, instead of recovery.
Change-Id: I6ab1b82841e4d6e90a8d156dea03448674f64446
Chaitanya Saggurthi [Mon, 24 Aug 2015 07:37:00 +0000 (13:07 +0530)]
Fix issue disable data of other SUB
if we enable data for non DDS SUB. Current implementation
will ask for user confirmation to change DDS and disable data
of current DDS SUB. It will block our DATA + MMS
feature and we can't send MMS on non DDS SUB.
Change-Id: I13f5ef1075e42b1dba8c10e58e7f156fbe0bc2f3
jianzhou [Sun, 15 Jun 2014 11:11:29 +0000 (07:11 -0400)]
Settings: Fix no preferred APN
Add preferred APN if found no match.
CRs-Fixed: 748830
Change-Id: Ibecf88a3e6236de13a0a4291438a6e62159a05e0
jianzhou [Thu, 31 Jul 2014 08:13:25 +0000 (16:13 +0800)]
Settings: Add the read only APN feature.
Disable the edit screen for read only APNs
Some operators don't want their APNs to be edited by
end user to avoid mistaken changes. End user should
be able to only view the APNs, but not edit.
Change-Id: I89f26ccc687d6989c562f164dbe53961a4d8a057
jianzhou [Thu, 31 Jul 2014 07:23:58 +0000 (15:23 +0800)]
Settings: Display APN PPP number
Display the APN PPP number if it is present in the APN settings
Change-Id: Iec30a2beadcdf078eaa6acd3a12f2e406ba9174e
Puneet Mishra [Thu, 27 Aug 2015 17:11:26 +0000 (18:11 +0100)]
Settings: Tap and Pay UI needs to be long clickable
NFC payment applications in the Tap and Pay UI need to react to a long
click to open the settings menu of the application with a predefined
intent.
Added longClickListener to NfcPaymentAdapter.
Change-Id: If352cf0ae7f819ed3286d5a7c7bb2b7dfc1b0ef7
Dinesh K Garg [Wed, 26 Aug 2015 17:42:54 +0000 (10:42 -0700)]
Clear traces of temporary stored password after updating password
If HW accelerated FDE is in use, LockSettingService would store old
password temporarily in memory untill password update is completed.
Once password update is complete, it resets the old password. This
change would additionally reset password everytime password update
process is started and completed.
Change-Id: I9a92b44678b023336a5d51b61c89cb102166de6c
Sandeep Gutta [Mon, 10 Aug 2015 09:39:59 +0000 (15:09 +0530)]
Telephony(MSIM): Manual provision related fixes
- Consider Manual provision state while displaying
active sub info list.
- Enable sms/data user preference option only
if more than one subscription active.
- Introduce below system proeprty to control AOSP
behavior of user selection of fallback preference
for sms/data
"persist.radio.aosp_usr_pref_sel"
Change-Id: I2b308b801f3f677c5a3ffaee5a8e6beda12aedd2
Suresh Koleti [Tue, 7 Jul 2015 11:22:20 +0000 (16:52 +0530)]
IMS: Control Wifi calling mode preference
Add configuration flags to control Wifi calling
mode preference UI options
If WFC mode UI is disabled sending WIFI_ONLY as default
preference mode.
Change-Id: I194059d00949b0f457a7bf0f09e33fc7285489c4
Chaitanya Saggurthi [Thu, 16 Jul 2015 11:03:34 +0000 (16:33 +0530)]
Telephony(MSIM): Add Manual provisioning support
Add toggle switch UI option in SimSettings screen to
enable/disable SIM cards
Change-Id: Id07271aedb12eabc0b106ac278ba2e12c71cfe03
Sai Aitharaju [Mon, 13 Oct 2014 09:55:42 +0000 (15:25 +0530)]
Bluetooth: Ignore the second button if one already pressed
Ignore the second buton if already one button is pressed,
this case comes when user is trying to press the both
cancel and ok for the pairing dialog
Change-Id: I77516ec59a972b4451bb8cff69645f7b9089497f
CRs-Fixed: 624285
Bluetooth: disable scan icon when BT state is off
Usually onScanningStateChanged function should take care
of disabling the scan icon when the scan is completed.
But When the BT scan is going on and try to switch of the
BT, as onScanningStateChanged function doesn't have the
reference for scan icon it will not disable it, so disabling
is taken care in BluetoothSettings on receiving BT Off state.
On receiving BT Off state, disable the scan progress icon only
when available device category is present.
Change-Id: Ib827903d4f5c80eeb6ac8a06fb1a945140dd20c9
CRs-Fixed: 543777,596214
Change-Id: Ia9c936fc53b099c18e0f5eadfb293eec028077a5
Venkata Jagadeesh [Thu, 20 Nov 2014 10:49:15 +0000 (16:19 +0530)]
Bluetooth: GAP: Handled Null pointer deference in unregisterReceiver
Handled Null pointer deference in unregisterReceiver event of
pairing dialog
Change-Id: Ie0d0561cb3c0f09a018e1aeb20579700c6e8d783
CRs-fixed: 761872
Hemant Gupta [Thu, 1 May 2014 11:59:38 +0000 (17:29 +0530)]
Bluetooth: Fix resource leak in OPP (2/3)
This patch handles onPause in DevicePickerFragment class, which
would be called when user presses back button and does not select
any device. This will send intent to class that called
DevicePickerFragment that no device is selected.
CRs-Fixed: 662147, 706665
Change-Id: I3dcf2811b300e44c0f3cb713c1397b5d334e8284
venkata Jagadeesh [Fri, 5 Apr 2013 13:32:43 +0000 (19:02 +0530)]
Bluetooth: Handle pairing Cancel intent.
Receive Pairing cancel intent and clear pairing request
from notification window.
CRs-fixed: 463362
Change-Id: I63c9299edca4356485f26cbc6332e3be9bdfbf17
Sai Aitharaju [Fri, 22 May 2015 03:58:53 +0000 (09:28 +0530)]
Bluetooth: Enable Page and Inquiry Scan
When Bluetooth Setting is in foreground enable both
Page Scan and Inquiry Scan.
Changes made to make device both connectable and
discoverable if user is in Bluetooth settings menu.
Change-Id: I5258149e375f4d6951055eac12d7127133e6af92
Nalla Kartheek [Tue, 28 Jul 2015 13:33:41 +0000 (19:03 +0530)]
Wi-Fi: Fix for SoftAP turn ON/OFF fails issue.
Turnig ON/OFF SAP repeatedly when WIFI is ON results in to command
CMD_SET_AP being received in WifiStaEnabledState of the state machine,
which will not be handled and because of this SoftAP is not turned ON and we
receive no events thus the check box remains greyed out/disabled.
To resolve this wait for WIFI_STATE_CHANGED intent before
re-enabling the SAP.
Change-Id: Ifc330309c7919f2efc2916573353d0764b5e1f9e
Anubhav Gupta [Mon, 2 Dec 2013 14:05:00 +0000 (19:35 +0530)]
Destroy BT disconnect dialog on BT power off.
Check for bluetooth off intent to destroy disconnect
dialog when bluetooth is turned off from power widget.
Change-Id: I47a261c7d98803feaf6d46660fe3d39325bead9a
Geoff Mendal [Fri, 28 Aug 2015 10:02:07 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
The Android Automerger [Tue, 25 Aug 2015 08:09:32 +0000 (01:09 -0700)]
merge in mnc-release history after reset to mnc-dev
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
The Android Automerger [Sat, 22 Aug 2015 08:11:49 +0000 (01:11 -0700)]
merge in mnc-release history after reset to mnc-dev
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.
Bug:
23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
Present the security patch date in a human-friendly format
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.
Bug
23358065
Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
The Android Automerger [Tue, 18 Aug 2015 08:10:13 +0000 (01:10 -0700)]
merge in mnc-release history after reset to mnc-dev
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.
Bug:
22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
The Android Automerger [Sat, 15 Aug 2015 08:11:27 +0000 (01:11 -0700)]
merge in mnc-release history after reset to mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug:
22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Adam Lesinski [Thu, 13 Aug 2015 23:56:30 +0000 (16:56 -0700)]
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.
Bug:
23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
The Android Automerger [Thu, 13 Aug 2015 08:06:59 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
The Android Automerger [Wed, 12 Aug 2015 08:06:25 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
Fix issue #
23079119: Description for write settings permission says...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
The Android Automerger [Tue, 11 Aug 2015 08:07:25 +0000 (01:07 -0700)]
merge in mnc-release history after reset to mnc-dev
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]
Remove extra help & feedback menu from power usage
Bug:
23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Ensure that listener is removed only if it was added" into mnc-dev
The Android Automerger [Sat, 8 Aug 2015 08:08:22 +0000 (01:08 -0700)]
merge in mnc-release history after reset to mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]
Block moving when already in progress.
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug:
22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
There be strings.
Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]
Ensure that listener is removed only if it was added
Bug:
23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200