OSDN Git Service
Srinu Jella [Thu, 25 Jun 2015 05:08:33 +0000 (05:08 +0000)]
am
1c1320a8: Bluetooth: Fix to avoid taking space as name upon orientation
* commit '
1c1320a84d22419efb3bf45d970f80b33658edc2':
Bluetooth: Fix to avoid taking space as name upon orientation
Srinu Jella [Mon, 12 May 2014 14:23:12 +0000 (19:53 +0530)]
Bluetooth: Fix to avoid taking space as name upon orientation
Use case: Renaming the DUT name on orientation chnage
STR:
1) Go for the option of rename phone.
2) give only space characters.
3) The rename option shows disabled.
4) Change the orientation of the phone.
5) Check whether it accepts space as a name.
Failure: Renaming a phone with space characters gets
accepted during change in orientation.Accepted
space as BT name upon changing orientation
Root cause: There is no check for validating the input
string while renaming the device name on orientation change.
Fix: This fix is to avoid taking space character as a name in the
BluetoothNameDialogFragment upon orientation change from
PORTRAIT mode to LANDSCAPE mode and vice versa.
Change-Id: Ia66f27bb9b06739e42d73b15745c12a42512a1fc
Sanket Padawe [Wed, 24 Jun 2015 21:37:43 +0000 (21:37 +0000)]
am
1c19cb5e: Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
* commit '
1c19cb5edd7a366192f28a0d7eb47e0021e9bbdd':
Add data limit paused string to Data Usage Settings screen.
Sanket Padawe [Wed, 24 Jun 2015 21:29:43 +0000 (21:29 +0000)]
Merge "Add data limit paused string to Data Usage Settings screen." into mnc-dev
Sanket Padawe [Wed, 24 Jun 2015 21:26:21 +0000 (14:26 -0700)]
Add data limit paused string to Data Usage Settings screen.
Bug:
17073752
Change-Id: I14ade2c13db9203d33c11b2b06307e06d87b3800
Jason Monk [Wed, 24 Jun 2015 19:18:39 +0000 (19:18 +0000)]
am
1cbbec00: Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
* commit '
1cbbec00ab574729c7bc547d250690b26a81057f':
Fix marquee on app snippet in InstalledAppDetails
Jason Monk [Wed, 24 Jun 2015 19:04:28 +0000 (19:04 +0000)]
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
Jason Monk [Wed, 24 Jun 2015 18:53:57 +0000 (14:53 -0400)]
Fix marquee on app snippet in InstalledAppDetails
First need to fix layout of the app_item as the widget was running
over the end of the view, do this by switching to a RelativeLayout.
Then select the view so it can actually marquee.
Bug:
22043942
Change-Id: Ieb94649ccf3dc8dcf56014c02fcdc06da71a9a62
Akshay Kannan [Wed, 24 Jun 2015 16:08:39 +0000 (16:08 +0000)]
am
5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit '
5006bf1de7a8add85f9a24706041757f9c93bb01':
Language Update for Wi-Fi/Bluetooth Scanning
Akshay Kannan [Wed, 24 Jun 2015 15:55:31 +0000 (15:55 +0000)]
Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
Geoff Mendal [Wed, 24 Jun 2015 15:45:39 +0000 (15:45 +0000)]
am
ab93f0e8: (-s ours) Import translations. DO NOT MERGE
* commit '
ab93f0e80372aa8c601d043781163cc93b98c9ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Jun 2015 15:01:08 +0000 (08:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I837fc4cac73ece9ddde78dcc941afc75ad3ae7ca
Auto-generated-cl: translation import
Daichi Hirono [Wed, 24 Jun 2015 05:29:49 +0000 (05:29 +0000)]
am
95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
* commit '
95029c97019f90499fbce040b8b7971a8de680ec':
Change the color of format button in "Device storage > Format" screen.
Daichi Hirono [Wed, 24 Jun 2015 05:22:00 +0000 (05:22 +0000)]
Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
Daichi Hirono [Wed, 24 Jun 2015 03:37:13 +0000 (12:37 +0900)]
Change the color of format button in "Device storage > Format" screen.
BUG=
21898857
Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
Lifu Tang [Wed, 24 Jun 2015 00:54:56 +0000 (17:54 -0700)]
Language Update for Wi-Fi/Bluetooth Scanning
Bug:
22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
Selim Cinek [Tue, 23 Jun 2015 22:02:04 +0000 (22:02 +0000)]
am
1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
* commit '
1726b2c94d994843abe43283465be7c049763b94':
Added contentDescription for fingerprint on the confirmCredential screen
Selim Cinek [Tue, 23 Jun 2015 21:50:26 +0000 (21:50 +0000)]
Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 21:48:48 +0000 (17:48 -0400)]
Added contentDescription for fingerprint on the confirmCredential screen
Bug:
21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
Jason Monk [Tue, 23 Jun 2015 19:59:17 +0000 (19:59 +0000)]
am
96a06144: Merge "Add action for search results including the count" into mnc-dev
* commit '
96a0614409e9bdc2df6dd83bc151a0d00eaf2ced':
Add action for search results including the count
Jason Monk [Tue, 23 Jun 2015 19:49:23 +0000 (19:49 +0000)]
Merge "Add action for search results including the count" into mnc-dev
Jason Monk [Tue, 23 Jun 2015 18:36:08 +0000 (14:36 -0400)]
Add action for search results including the count
Bug:
20293458
Change-Id: I9d3f04fb74c0e978e69e17898b703e270298fcbc
Jason Monk [Tue, 23 Jun 2015 17:39:36 +0000 (17:39 +0000)]
am
52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
* commit '
52e728ab114d37b24a0c50dba58f8d81b4e1ea9b':
Screen pinning set default lock on exit value
Jason Monk [Tue, 23 Jun 2015 17:30:13 +0000 (17:30 +0000)]
Merge "Screen pinning set default lock on exit value" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 17:28:33 +0000 (17:28 +0000)]
am
966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
* commit '
966a29dc979cedb1b90faec5bba25a0fd6d2bf10':
Improved talkback fingerprint enrollment flow
Jason Monk [Tue, 23 Jun 2015 16:07:27 +0000 (12:07 -0400)]
Screen pinning set default lock on exit value
The UI default varies based on security state, so make sure we set
the current value when we turn on the feature so that the setting
has the same value as the UI.
Bug:
21999172
Change-Id: I6c920aa93aab391852d6f3a4dd8ee52da5618729
Selim Cinek [Tue, 23 Jun 2015 17:14:42 +0000 (17:14 +0000)]
Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
Selim Cinek [Tue, 23 Jun 2015 17:12:24 +0000 (13:12 -0400)]
Improved talkback fingerprint enrollment flow
Bug:
21565901
Change-Id: If25468574afd25b1a7d19278710045083ba1d4f7
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 09:50:32 +0000 (09:50 +0000)]
am
9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
* commit '
9dd754e1f405aa47a6d9c97bf50f23c8f51b7a79':
Reflect effect of all Wifi editability factors in Settings
Zoltan Szatmary-Ban [Tue, 23 Jun 2015 08:44:35 +0000 (08:44 +0000)]
Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
Sanket Padawe [Tue, 23 Jun 2015 02:57:29 +0000 (02:57 +0000)]
am
2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
* commit '
2bed3a507faaab29569857fd7a92b739faa31ee3':
Align Enlish words to RTL in RTL context in networkreset Settings.
Sanket Padawe [Tue, 23 Jun 2015 02:47:27 +0000 (02:47 +0000)]
Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
Sanket Padawe [Tue, 23 Jun 2015 02:46:28 +0000 (19:46 -0700)]
Align Enlish words to RTL in RTL context in networkreset Settings.
Bug:
21553326
Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
Sanket Padawe [Tue, 23 Jun 2015 00:43:57 +0000 (00:43 +0000)]
am
4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
* commit '
4044d6cdd6309e06377ae57a4b941f2db87d6942':
Fix display of "Contact sharing" option in Car kit for BT Settings.
Sanket Padawe [Tue, 23 Jun 2015 00:34:32 +0000 (00:34 +0000)]
Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
xinhe [Tue, 23 Jun 2015 00:20:09 +0000 (00:20 +0000)]
am
d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
* commit '
d55ddc337edd7236a7024602b7970e146f9489db':
if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config
xinhe [Mon, 22 Jun 2015 23:56:10 +0000 (23:56 +0000)]
Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev
xinhe [Mon, 22 Jun 2015 22:26:33 +0000 (15:26 -0700)]
if do not turn on wifi STA or SAP, there is no 5GHz choice
for SAP config
b/
22008176
Change-Id: Id1020f975bce1ff7a3c738c4180f3d7686718d82
Alan Viverette [Mon, 22 Jun 2015 21:01:57 +0000 (21:01 +0000)]
am
8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
* commit '
8a4e44ba92d2c7552860d7e8d23015c013da32f4':
Ensure "default" and "none" caption colors are consistent w/ framework
Makoto Onuki [Mon, 22 Jun 2015 21:01:56 +0000 (21:01 +0000)]
am
b544ce78: Merge "Set service name to printer service setting title" into mnc-dev
* commit '
b544ce78dc63b9119dcc741d18200f3128d42aa3':
Set service name to printer service setting title
Alan Viverette [Mon, 22 Jun 2015 20:55:10 +0000 (20:55 +0000)]
Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
Makoto Onuki [Mon, 22 Jun 2015 20:47:58 +0000 (20:47 +0000)]
Merge "Set service name to printer service setting title" into mnc-dev
Makoto Onuki [Mon, 22 Jun 2015 20:43:49 +0000 (13:43 -0700)]
Set service name to printer service setting title
Bug
21899319
Change-Id: I940957dd4036eb3386c7f59fbbd3608e7169f415
Alan Viverette [Mon, 22 Jun 2015 20:05:45 +0000 (13:05 -0700)]
Ensure "default" and "none" caption colors are consistent w/ framework
Also enables scroll indicators in color grid dialog.
Bug:
21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
Sanket Padawe [Mon, 22 Jun 2015 19:33:53 +0000 (12:33 -0700)]
Fix display of "Contact sharing" option in Car kit for BT Settings.
Bug:
21879473
Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
Alan Viverette [Mon, 22 Jun 2015 17:27:31 +0000 (17:27 +0000)]
am
14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev
* commit '
14f5da9b4d2cb1e0b6828312613bf8f4c8a1df2d':
Disable foreground opacity when using default foreground color
Barnaby James [Mon, 22 Jun 2015 17:27:30 +0000 (17:27 +0000)]
am
ab1c2b0d: Merge "Hide title of the zen mode voice activity." into mnc-dev
* commit '
ab1c2b0d8097396fd67045f52829703e84e73350':
Hide title of the zen mode voice activity.
Alan Viverette [Mon, 22 Jun 2015 17:20:06 +0000 (17:20 +0000)]
Merge "Disable foreground opacity when using default foreground color" into mnc-dev
Barnaby James [Mon, 22 Jun 2015 17:18:20 +0000 (17:18 +0000)]
Merge "Hide title of the zen mode voice activity." into mnc-dev
Alan Viverette [Mon, 22 Jun 2015 17:07:19 +0000 (10:07 -0700)]
Disable foreground opacity when using default foreground color
Bug:
21602597
Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
Barnaby James [Mon, 22 Jun 2015 00:05:22 +0000 (17:05 -0700)]
Hide title of the zen mode voice activity.
Zen mode voice activity doesn't show any UI but the activity title is still shown.
BUG:
21985804
Change-Id: I1e7bd07deb59bcb36005fa7e4bca766af03d742b
Geoff Mendal [Mon, 22 Jun 2015 15:38:50 +0000 (15:38 +0000)]
am
e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e4841b38d05eba058061651b11020c551a014914':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 22 Jun 2015 15:31:25 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Mon, 22 Jun 2015 15:02:15 +0000 (15:02 +0000)]
am
b4b590d1: Merge "Update disable dialog" into mnc-dev
* commit '
b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
Update disable dialog
Geoff Mendal [Mon, 22 Jun 2015 15:00:38 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
Jason Monk [Mon, 22 Jun 2015 14:55:11 +0000 (14:55 +0000)]
Merge "Update disable dialog" into mnc-dev
Pavel Zhamaitsiak [Mon, 22 Jun 2015 03:43:31 +0000 (03:43 +0000)]
am
5a6d17c8: Log WiFi Calling actions from settings
* commit '
5a6d17c8cdb099b8533fb4c12c23d31da4bafe41':
Log WiFi Calling actions from settings
Pavel Zhamaitsiak [Sat, 20 Jun 2015 22:48:00 +0000 (15:48 -0700)]
Log WiFi Calling actions from settings
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
Adrian Roos [Sat, 20 Jun 2015 03:28:00 +0000 (03:28 +0000)]
am
a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
* commit '
a029671bfd2d915ce6d43fa31a896058454cfe24':
Work around improper ListView recycling in TrustAgentSettings
Selim Cinek [Sat, 20 Jun 2015 03:27:59 +0000 (03:27 +0000)]
am
5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
* commit '
5f0976a0ac1054d59133e6f5661b50c4e9dcecfe':
Fixed a crash when rotating the Fingerprint renaming dialog
Adrian Roos [Sat, 20 Jun 2015 03:23:03 +0000 (03:23 +0000)]
Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
Selim Cinek [Sat, 20 Jun 2015 03:21:20 +0000 (03:21 +0000)]
Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
Adrian Roos [Sat, 20 Jun 2015 02:59:53 +0000 (19:59 -0700)]
Work around improper ListView recycling in TrustAgentSettings
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.
Bug:
21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
Selim Cinek [Fri, 19 Jun 2015 20:12:22 +0000 (13:12 -0700)]
Fixed a crash when rotating the Fingerprint renaming dialog
Bug:
21815069
Change-Id: Ice90a5786685c300a522a908c1107af9e5311eb3
Robin Lee [Fri, 19 Jun 2015 20:10:51 +0000 (20:10 +0000)]
am
3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '
3a839be7c165ea152179fb5b4531f4f6fdb7c822':
Only unregister the network callback at onPause
Robin Lee [Fri, 19 Jun 2015 20:03:05 +0000 (20:03 +0000)]
Merge "Only unregister the network callback at onPause" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 15:33:37 +0000 (15:33 +0000)]
am
d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '
d63e696902cbefaa7361aaa16e6b20d0fe593cdb':
Add content description to owner info status text
Jason Monk [Fri, 19 Jun 2015 15:22:20 +0000 (15:22 +0000)]
Merge "Add content description to owner info status text" into mnc-dev
Jason Monk [Fri, 19 Jun 2015 15:17:03 +0000 (11:17 -0400)]
Add content description to owner info status text
Bug:
21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
John Spurlock [Fri, 19 Jun 2015 15:03:16 +0000 (15:03 +0000)]
am
7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '
7699cad0042b8bc8cf3cd5ca728f013abe175de8':
Settings: Add widget entry point to magical entry points listing.
John Spurlock [Fri, 19 Jun 2015 14:55:10 +0000 (14:55 +0000)]
Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
John Spurlock [Fri, 19 Jun 2015 14:47:36 +0000 (10:47 -0400)]
Settings: Add widget entry point to magical entry points listing.
Bug:
21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
Zoltan Szatmary-Ban [Wed, 27 May 2015 11:47:32 +0000 (12:47 +0100)]
Reflect effect of all Wifi editability factors in Settings
Bug:
21427528
Bug:
21150087
Bug:
21612565
Change-Id: I62962a9b3fc1bb9c90be79e133873006da102054
Brian Carlstrom [Fri, 19 Jun 2015 04:33:16 +0000 (04:33 +0000)]
am
2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '
2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
Clarify process_dex2oat_label description
Brian Carlstrom [Fri, 19 Jun 2015 04:23:07 +0000 (04:23 +0000)]
Merge "Clarify process_dex2oat_label description" into mnc-dev
Sanket Padawe [Fri, 19 Jun 2015 01:51:27 +0000 (01:51 +0000)]
am
5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '
5ba90c148d41ae3f330d7f31de8bced5e21c8727':
Increase char limit of the data usage Settings string to 33.
Sanket Padawe [Fri, 19 Jun 2015 01:39:25 +0000 (18:39 -0700)]
Increase char limit of the data usage Settings string to 33.
Bug:
21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
Jason Monk [Thu, 18 Jun 2015 20:16:51 +0000 (20:16 +0000)]
am
47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '
47a26c79288723b8604a91c5cd8daedd83f183f2':
Fix ListView being too eager too scroll
Jason Monk [Thu, 18 Jun 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Fix ListView being too eager too scroll" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:56:21 +0000 (15:56 -0400)]
Fix ListView being too eager too scroll
ListView is always too eager to scroll, so just stop using it.
Bug:
21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
Jason Monk [Thu, 18 Jun 2015 19:29:48 +0000 (19:29 +0000)]
am
6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
6c5b27e042b5d36f404f11da85145a287a6f1df4':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev
Alex Chau [Thu, 18 Jun 2015 17:22:23 +0000 (17:22 +0000)]
am
cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
* commit '
cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
Brian Carlstrom [Thu, 18 Jun 2015 17:11:18 +0000 (10:11 -0700)]
Clarify process_dex2oat_label description
Bug:
21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
Alex Chau [Thu, 18 Jun 2015 17:10:34 +0000 (17:10 +0000)]
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:36:34 +0000 (12:36 -0400)]
Fix opening secured networks from QS
Bug:
21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
Jason Monk [Thu, 18 Jun 2015 16:11:49 +0000 (16:11 +0000)]
am
ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev
* commit '
ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
Revert "Accounts -> Account sync"
Jason Monk [Thu, 18 Jun 2015 15:54:55 +0000 (15:54 +0000)]
Merge "Revert "Accounts -> Account sync"" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:44:25 +0000 (15:44 +0000)]
Revert "Accounts -> Account sync"
This reverts commit
43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b.
Bug:
21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
Jason Monk [Thu, 18 Jun 2015 15:41:36 +0000 (15:41 +0000)]
am
1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev
* commit '
1a129e0fbb2fdfc4f5b7bda82a457e907a4aeb4f':
Remove battery history graph from details screen
Jason Monk [Thu, 18 Jun 2015 15:41:35 +0000 (15:41 +0000)]
am
58f6728e: Allow give/take in app version/disabled fields
* commit '
58f6728e6ef8c89d9b88d78b19b2d0f24135564d':
Allow give/take in app version/disabled fields
Junda Liu [Thu, 18 Jun 2015 15:41:33 +0000 (15:41 +0000)]
am
2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev
* commit '
2c55f738c4336a3f379f94f4142c20a473ae3a9a':
Don't show SIM lock Setting if carrier config hides it.
Jason Monk [Thu, 18 Jun 2015 15:31:22 +0000 (15:31 +0000)]
Merge "Remove battery history graph from details screen" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 15:06:18 +0000 (11:06 -0400)]
Remove battery history graph from details screen
Bug:
21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
Alex Chau [Fri, 12 Jun 2015 10:45:08 +0000 (11:45 +0100)]
Enforce Keyguard policy in Notification Settings
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug:
19307118
Bug:
17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
Jason Monk [Thu, 18 Jun 2015 14:46:55 +0000 (10:46 -0400)]
Update disable dialog
Bug:
20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
Jason Monk [Thu, 18 Jun 2015 14:36:39 +0000 (10:36 -0400)]
Allow give/take in app version/disabled fields
Switch to wrap_content so if one view is smaller, the other
can use its space.
Bug:
21901206
Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
Robin Lee [Thu, 18 Jun 2015 01:43:59 +0000 (18:43 -0700)]
Only unregister the network callback at onPause
Bug:
21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
Junda Liu [Wed, 17 Jun 2015 22:50:59 +0000 (22:50 +0000)]
Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 17:15:34 +0000 (10:15 -0700)]
Don't show SIM lock Setting if carrier config hides it.
Bug: b/
19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787