OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "Hide tap to wake on devices that don't support it" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:26:12 +0000 (20:26 +0000)]
Merge "Hide tap to wake on devices that don't support it" into mnc-dev

9 years agoHide tap to wake on devices that don't support it
Jason Monk [Mon, 8 Jun 2015 13:11:48 +0000 (09:11 -0400)]
Hide tap to wake on devices that don't support it

Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed

9 years agoMerge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:12:06 +0000 (20:12 +0000)]
Merge "App storage settings - Request size onResume" into mnc-dev

9 years agoApp storage settings - Request size onResume
Jason Monk [Wed, 10 Jun 2015 20:08:01 +0000 (16:08 -0400)]
App storage settings - Request size onResume

Our data might be stale (especially when coming from manage space
activities).

Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb

9 years agoMerge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:06:09 +0000 (20:06 +0000)]
Merge "New dialog for ignore battery optimizations" into mnc-dev

9 years agoNew dialog for ignore battery optimizations
Jason Monk [Wed, 10 Jun 2015 15:03:06 +0000 (11:03 -0400)]
New dialog for ignore battery optimizations

Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f

9 years agoAdd string for profile owner usage access warning
Jason Monk [Wed, 10 Jun 2015 19:26:35 +0000 (15:26 -0400)]
Add string for profile owner usage access warning

Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68

9 years agoMerge "Add simulated 4K display modes." into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Add simulated 4K display modes." into mnc-dev

9 years agoMerge "Implement default assist app setting" into mnc-dev
Xiyuan Xia [Wed, 10 Jun 2015 17:08:43 +0000 (17:08 +0000)]
Merge "Implement default assist app setting" into mnc-dev

9 years agoMerge "Show list of permissions instead of just numbers" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 16:39:06 +0000 (16:39 +0000)]
Merge "Show list of permissions instead of just numbers" into mnc-dev

9 years agoImplement default assist app setting
Xiyuan Xia [Tue, 2 Jun 2015 21:55:32 +0000 (14:55 -0700)]
Implement default assist app setting

- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302

9 years agoMerge changes from topic 'no-internet-notification' into mnc-dev
Lorenzo Colitti [Wed, 10 Jun 2015 15:25:24 +0000 (15:25 +0000)]
Merge changes from topic 'no-internet-notification' into mnc-dev

* changes:
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 10 Jun 2015 15:25:01 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoFix legal info back button
Jason Monk [Wed, 10 Jun 2015 14:02:59 +0000 (10:02 -0400)]
Fix legal info back button

Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Jun 2015 15:04:57 +0000 (08:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import

9 years agoPass in the netId using intent data, not intent extras.
Lorenzo Colitti [Wed, 10 Jun 2015 13:49:52 +0000 (22:49 +0900)]
Pass in the netId using intent data, not intent extras.

This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.

Bug: 20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9

9 years agoReword "no internet access" dialog to conform with mocks.
Lorenzo Colitti [Wed, 10 Jun 2015 06:16:36 +0000 (15:16 +0900)]
Reword "no internet access" dialog to conform with mocks.

Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2

9 years agoMerge "annoint new constants" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 14:14:38 +0000 (14:14 +0000)]
Merge "annoint new constants" into mnc-dev

9 years agoRemove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 13:04:14 +0000 (09:04 -0400)]
Remove periods from ignore optimizations summaries

Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c

9 years agoMerge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:32 +0000 (12:59 +0000)]
Merge "Advanced apps updates (2/2)" into mnc-dev

9 years agoMerge "Add sd card string, just in case" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:29 +0000 (12:59 +0000)]
Merge "Add sd card string, just in case" into mnc-dev

9 years agoMerge "Modifications for changes to SettingsLib" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 12:23:45 +0000 (12:23 +0000)]
Merge "Modifications for changes to SettingsLib" into mnc-dev

9 years agoAdd simulated 4K display modes.
Jeff Brown [Wed, 10 Jun 2015 01:25:04 +0000 (18:25 -0700)]
Add simulated 4K display modes.

Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e

9 years agoMerge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev

9 years agoGuest option should not be shown for the guest user
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user

Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d

9 years agoSAP: Make it possible to enforce a 16-digit pin code (5/5)
Casper Bonde [Fri, 8 May 2015 13:19:03 +0000 (15:19 +0200)]
SAP: Make it possible to enforce a 16-digit pin code (5/5)

This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
9 years agoMerge "Move CryptKeeper to own process" into mnc-dev
Paul Lawrence [Tue, 9 Jun 2015 20:56:24 +0000 (20:56 +0000)]
Merge "Move CryptKeeper to own process" into mnc-dev

9 years agoMerge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev

9 years agoAdd sd card string, just in case
Jason Monk [Tue, 9 Jun 2015 20:25:32 +0000 (16:25 -0400)]
Add sd card string, just in case

Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527

9 years agoAdvanced apps updates (2/2)
Jason Monk [Tue, 9 Jun 2015 20:01:28 +0000 (16:01 -0400)]
Advanced apps updates (2/2)

Change the title of the screen, add a category to break things up

Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25

9 years agoMerge "Accounts -> Account sync" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Accounts -> Account sync" into mnc-dev

9 years agoMerge "Bring back gear icon for advanced app settings" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:22 +0000 (19:49 +0000)]
Merge "Bring back gear icon for advanced app settings" into mnc-dev

9 years agoBring back gear icon for advanced app settings
Jason Monk [Tue, 9 Jun 2015 19:45:17 +0000 (15:45 -0400)]
Bring back gear icon for advanced app settings

Bug: 21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba

9 years agoTop level: "Storage" -> "Storage & USB"
Jason Monk [Tue, 9 Jun 2015 19:32:14 +0000 (15:32 -0400)]
Top level: "Storage" -> "Storage & USB"

Bug: 21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92

9 years agoAdd strings that will be used for new ignore opt ux
Jason Monk [Tue, 9 Jun 2015 19:19:11 +0000 (15:19 -0400)]
Add strings that will be used for new ignore opt ux

Bug: 21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc

9 years agoAccounts -> Account sync
Jason Monk [Tue, 9 Jun 2015 18:46:57 +0000 (14:46 -0400)]
Accounts -> Account sync

Bug: 21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe

9 years agoannoint new constants
Chris Wren [Tue, 9 Jun 2015 18:24:03 +0000 (14:24 -0400)]
annoint new constants

Bug: 21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9

9 years agoMerge "Move ApplicationsState to SettingsLib" into mnc-dev
Tony Mantler [Tue, 9 Jun 2015 17:20:16 +0000 (17:20 +0000)]
Merge "Move ApplicationsState to SettingsLib" into mnc-dev

9 years agoMerge "Update some strings." into mnc-dev
Sudheer Shanka [Tue, 9 Jun 2015 16:24:13 +0000 (16:24 +0000)]
Merge "Update some strings." into mnc-dev

9 years agoinstrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:07:14 +0000 (12:07 -0400)]
instrument display rotation settings

Bug: 21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb

9 years agodon't double set the dropdown value
Chris Wren [Tue, 9 Jun 2015 16:06:54 +0000 (12:06 -0400)]
don't double set the dropdown value

idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.

This makes it hard to count actual user interactions without counting the initialization.

Bug: 21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec

9 years agoUpdate some strings.
Sudheer Shanka [Tue, 9 Jun 2015 13:26:27 +0000 (14:26 +0100)]
Update some strings.

Bug: 20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745

9 years agoModifications for changes to SettingsLib
Neil Fuller [Tue, 9 Jun 2015 09:10:56 +0000 (10:10 +0100)]
Modifications for changes to SettingsLib

See associated changes in frameworks/base for details.

Bug: 19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de

9 years agoShow list of permissions instead of just numbers
Makoto Onuki [Fri, 5 Jun 2015 21:32:10 +0000 (14:32 -0700)]
Show list of permissions instead of just numbers

Bug 21615746

Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9

9 years agoUpdate and cleanup FingerprintManager API to new spec
Jim Miller [Wed, 27 May 2015 01:26:11 +0000 (18:26 -0700)]
Update and cleanup FingerprintManager API to new spec

Fixes bug 21040383

Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815

9 years agoMove ApplicationsState to SettingsLib
Tony Mantler [Mon, 8 Jun 2015 21:41:02 +0000 (14:41 -0700)]
Move ApplicationsState to SettingsLib

Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings

b/21328967

Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e

9 years agoMerge "Settings: Update notification listener user prompt strings." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Settings: Update notification listener user prompt strings." into mnc-dev

9 years agoSettings: Update notification listener user prompt strings.
John Spurlock [Mon, 8 Jun 2015 20:50:36 +0000 (16:50 -0400)]
Settings: Update notification listener user prompt strings.

Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12

9 years agoMerge "Fix settings overdraw" into mnc-dev
Jorim Jaggi [Mon, 8 Jun 2015 18:39:24 +0000 (18:39 +0000)]
Merge "Fix settings overdraw" into mnc-dev

9 years agoMerge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 18:11:15 +0000 (18:11 +0000)]
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev

9 years agoMove CryptKeeper to own process
Paul Lawrence [Mon, 8 Jun 2015 18:00:50 +0000 (11:00 -0700)]
Move CryptKeeper to own process

It is possible to run settings from within keyboard, and then find ways of
crashing it. This restarts CryptKeeper since they are one process, with
bad consequences (see bug).

Move to separate process to alleviate this problem

Bug: 21514179
Change-Id: Ib2c19e8f0f3956402cc11a2caedc0a45f786cac3

9 years agoMerge "Settings: Update DND access dialog to new user flow." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 16:39:32 +0000 (16:39 +0000)]
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev

9 years agoSwitch from KeyStore.saw to KeyStore.list.
Alex Klyubin [Mon, 8 Jun 2015 16:30:08 +0000 (09:30 -0700)]
Switch from KeyStore.saw to KeyStore.list.

KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.

Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1

9 years agoSettings: Update DND access dialog to new user flow.
John Spurlock [Thu, 4 Jun 2015 17:01:59 +0000 (13:01 -0400)]
Settings: Update DND access dialog to new user flow.

 - Only list apps in the DND access list that have included
   the corresponding permission in their manifest.
 - Show a scary user warning before enabling access per app.
 - Update manifest to follow framework intent action rename.

Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 14:59:45 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import

9 years agoMerge "Add NFC payment "how it works" screens." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:02:28 +0000 (08:02 +0000)]
Merge "Add NFC payment "how it works" screens." into mnc-dev

9 years agoMerge "NFC: don't use dynamic resources." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:01:45 +0000 (08:01 +0000)]
Merge "NFC: don't use dynamic resources." into mnc-dev

9 years agoMerge "Fix wifi network strings shown in Settings." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:58:18 +0000 (01:58 +0000)]
Merge "Fix wifi network strings shown in Settings." into mnc-dev

9 years agoFix wifi network strings shown in Settings.
Sanket Padawe [Sat, 6 Jun 2015 01:49:12 +0000 (18:49 -0700)]
Fix wifi network strings shown in Settings.

Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d

9 years agoFix settings overdraw
Jorim Jaggi [Sat, 6 Jun 2015 00:42:32 +0000 (17:42 -0700)]
Fix settings overdraw

Bug: 17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122

9 years agoMerge "Add UI for camera + flashlight battery reporting." into mnc-dev
Ruben Brunk [Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev

9 years agoAdd UI for camera + flashlight battery reporting.
Ruben Brunk [Thu, 4 Jun 2015 01:53:40 +0000 (18:53 -0700)]
Add UI for camera + flashlight battery reporting.

Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa

9 years agoAdd NFC payment "how it works" screens.
Martijn Coenen [Fri, 5 Jun 2015 19:28:17 +0000 (21:28 +0200)]
Add NFC payment "how it works" screens.

Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67

9 years agoMerge "Update Setup Wizard redaction interstitial styles" into mnc-dev
Maurice Lam [Fri, 5 Jun 2015 19:13:17 +0000 (19:13 +0000)]
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev

9 years agoMerge "Fix lockpattern weirdness" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:12:16 +0000 (18:12 +0000)]
Merge "Fix lockpattern weirdness" into mnc-dev

9 years agoMerge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:37:04 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev

9 years agoMerge "Settings > Apps list style updates" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
Merge "Settings > Apps list style updates" into mnc-dev

9 years agoMerge "Fix some dark theme issues (Take 2)" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:23:12 +0000 (13:23 +0000)]
Merge "Fix some dark theme issues (Take 2)" into mnc-dev

9 years agoNFC: don't use dynamic resources.
Martijn Coenen [Fri, 5 Jun 2015 09:36:50 +0000 (11:36 +0200)]
NFC: don't use dynamic resources.

Also fixed talk-back for the default
payment app selection.

Bug: 21343778
Bug: 21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027

9 years agoFix lockpattern weirdness
Jorim Jaggi [Fri, 5 Jun 2015 01:00:34 +0000 (18:00 -0700)]
Fix lockpattern weirdness

- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.

Bug: 21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0

9 years agoUpdate Setup Wizard redaction interstitial styles
Maurice Lam [Fri, 5 Jun 2015 00:17:07 +0000 (17:17 -0700)]
Update Setup Wizard redaction interstitial styles

Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.

Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70

9 years agoEnhance change default SMS app dialog to show list of apps
Ye Wen [Tue, 2 Jun 2015 23:02:23 +0000 (16:02 -0700)]
Enhance change default SMS app dialog to show list of apps

Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.

b/20430567

Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb

9 years agoSetup the animation callback for AnimatedVectorDrawable
ztenghui [Tue, 26 May 2015 21:53:41 +0000 (14:53 -0700)]
Setup the animation callback for AnimatedVectorDrawable

b/21341096

Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4

9 years agoSettings > Apps list style updates
Jason Monk [Thu, 4 Jun 2015 19:17:16 +0000 (15:17 -0400)]
Settings > Apps list style updates

Bug: 21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c

9 years agoFix some dark theme issues (Take 2)
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues (Take 2)

Now with visible lock patterns! Both light and dark!

Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af

9 years agoMerge "Fix apps/memory screen's spinner alignment" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 18:09:08 +0000 (18:09 +0000)]
Merge "Fix apps/memory screen's spinner alignment" into mnc-dev

9 years agoFix apps/memory screen's spinner alignment
Jason Monk [Thu, 4 Jun 2015 17:54:06 +0000 (13:54 -0400)]
Fix apps/memory screen's spinner alignment

Bug: 21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b

9 years agoMerge "Fix dashboard shadows on tablets" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 16:14:31 +0000 (16:14 +0000)]
Merge "Fix dashboard shadows on tablets" into mnc-dev

9 years agoFix dashboard shadows on tablets
Jason Monk [Thu, 4 Jun 2015 16:04:30 +0000 (12:04 -0400)]
Fix dashboard shadows on tablets

Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581

9 years agoMerge "Settings: Add zen rule name warning text." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 15:41:58 +0000 (15:41 +0000)]
Merge "Settings: Add zen rule name warning text." into mnc-dev

9 years agoSettings: Add zen rule name warning text.
John Spurlock [Thu, 4 Jun 2015 15:37:36 +0000 (11:37 -0400)]
Settings: Add zen rule name warning text.

Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea

9 years agoMerge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Fix updates of the enable/disable button" into mnc-dev

9 years agoMerge "Fix crash in battery screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 14:58:57 +0000 (14:58 +0000)]
Merge "Fix crash in battery screen" into mnc-dev

9 years agoFix updates of the enable/disable button
Jason Monk [Thu, 4 Jun 2015 14:57:31 +0000 (10:57 -0400)]
Fix updates of the enable/disable button

Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.

ApplicationsState could use some refactoring.

Bug: 21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4

9 years agoFix crash in battery screen
Jason Monk [Thu, 4 Jun 2015 14:50:25 +0000 (10:50 -0400)]
Fix crash in battery screen

Also add a fake app item

Bug: 21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400

9 years agoMerge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules...
John Spurlock [Thu, 4 Jun 2015 14:48:01 +0000 (14:48 +0000)]
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev

9 years agoSettings: Enable "ok" dialog button for no-op changes to existing zen rules.
John Spurlock [Thu, 4 Jun 2015 14:44:45 +0000 (10:44 -0400)]
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.

Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76

9 years agoMerge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:08:48 +0000 (13:08 +0000)]
Merge "Disable owner info when no lock screen" into mnc-dev

9 years agoMerge "Protect against monkey crash" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 12:55:44 +0000 (12:55 +0000)]
Merge "Protect against monkey crash" into mnc-dev

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Thu, 4 Jun 2015 08:05:02 +0000 (01:05 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoMerge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:52:11 +0000 (02:52 +0000)]
Merge "Revert "Fix some dark theme issues"" into mnc-dev

9 years agoRevert "Fix some dark theme issues"
Jim Miller [Thu, 4 Jun 2015 02:45:40 +0000 (02:45 +0000)]
Revert "Fix some dark theme issues"

This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.

This reverts commit cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227

9 years agoMerge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
Sanket Padawe [Thu, 4 Jun 2015 01:47:49 +0000 (01:47 +0000)]
Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev

9 years agoDisplay softKeyboard when entering pin for pairing BT device.
Sanket Padawe [Thu, 4 Jun 2015 01:47:25 +0000 (18:47 -0700)]
Display softKeyboard when entering pin for pairing BT device.

Bug: 18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28

9 years agoMerge "Re-add a string which was accidently removed." into mnc-dev
Stuart Scott [Thu, 4 Jun 2015 00:51:13 +0000 (00:51 +0000)]
Merge "Re-add a string which was accidently removed." into mnc-dev

9 years agoRe-add a string which was accidently removed.
Stuart Scott [Thu, 4 Jun 2015 00:01:42 +0000 (17:01 -0700)]
Re-add a string which was accidently removed.

bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1

9 years agoMerge "In Settings, don't allow to disable an app which is profile/device owner....
Nicolas Prevot [Wed, 3 Jun 2015 22:17:10 +0000 (22:17 +0000)]
Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev

9 years agoIn Settings, don't allow to disable an app which is profile/device owner.
Nicolas Prevot [Wed, 3 Jun 2015 21:36:35 +0000 (14:36 -0700)]
In Settings, don't allow to disable an app which is profile/device owner.

In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.

BUG: 20831525

Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0

9 years agoFix Wifi Settings crash on continuous wifi toggling.
Sanket Padawe [Wed, 3 Jun 2015 21:16:13 +0000 (14:16 -0700)]
Fix Wifi Settings crash on continuous wifi toggling.

Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60

9 years agoDisable owner info when no lock screen
Jason Monk [Wed, 3 Jun 2015 20:37:07 +0000 (16:37 -0400)]
Disable owner info when no lock screen

Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e