OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 18:57:40 +0000 (18:57 +0000)]
Merge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
am: 8b47c12550

Change-Id: I29e31e40f60f160e26c1ec17afb4cb60cbe90b7a

8 years agoMerge "Tweak layouts to make support UI look better." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 18:51:54 +0000 (18:51 +0000)]
Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev

8 years agoMerge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am...
Mark Salyzyn [Wed, 13 Jul 2016 18:09:12 +0000 (18:09 +0000)]
Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
am: 2e6a8bb8f8

Change-Id: I67e73fbe05e88580d41bae73436e53a325655634

8 years agoMerge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am...
Mark Salyzyn [Wed, 13 Jul 2016 18:05:34 +0000 (18:05 +0000)]
Merge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: a1b40f0267
am: 455006c9ca

Change-Id: Ia486d98338a1fdc60103324c99a46b31883af932

8 years agoMerge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
Mark Salyzyn [Wed, 13 Jul 2016 18:02:20 +0000 (18:02 +0000)]
Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28

8 years agoMerge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"
Treehugger Robot [Wed, 13 Jul 2016 17:45:44 +0000 (17:45 +0000)]
Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"

8 years agoMerge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapt...
Doris Ling [Wed, 13 Jul 2016 17:25:16 +0000 (17:25 +0000)]
Merge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapter\" into nyc-mr1-dev
am: 8c50ced07c

Change-Id: I0989b7f8e122d5221757b57b1866d536a1657ae3

8 years agoTweak layouts to make support UI look better.
Fan Zhang [Wed, 13 Jul 2016 16:22:04 +0000 (09:22 -0700)]
Tweak layouts to make support UI look better.

Fixes: 30087623

- Removed some padding and hide empty textviews.

Change-Id: Id8476aa3870d796c5f5a34c2f3fa6db34918691b

8 years agoMerge "Reduce the number of times that dataset changed is triggerd in DashboardAdapte...
Doris Ling [Wed, 13 Jul 2016 17:13:05 +0000 (17:13 +0000)]
Merge "Reduce the number of times that dataset changed is triggerd in DashboardAdapter" into nyc-mr1-dev

8 years agoMerge \"Log when the storage manager is toggled on and off.\" into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 16:35:34 +0000 (16:35 +0000)]
Merge \"Log when the storage manager is toggled on and off.\" into nyc-mr1-dev
am: 3cd686d4a9

Change-Id: I94a22cadb4c142e5fabeb956d411a794e5c0032a

8 years agoMerge "Log when the storage manager is toggled on and off." into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 16:26:04 +0000 (16:26 +0000)]
Merge "Log when the storage manager is toggled on and off." into nyc-mr1-dev

8 years agoMerge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into...
Mahaver Chopra [Wed, 13 Jul 2016 12:34:04 +0000 (12:34 +0000)]
Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into nyc-mr1-dev
am: ec618dc585

Change-Id: Ide526f716b96a73635853d621bef61d09ff04425

8 years agoMerge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc...
Mahaver Chopra [Wed, 13 Jul 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev

8 years agoMerge \"Request support rules to refresh when account changes.\" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 01:25:45 +0000 (01:25 +0000)]
Merge \"Request support rules to refresh when account changes.\" into nyc-mr1-dev
am: 987eadbd4b

Change-Id: I7ff6ead262c69d18b8a5fc746e58c1a62a23e68a

8 years agoMerge "Request support rules to refresh when account changes." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 01:13:01 +0000 (01:13 +0000)]
Merge "Request support rules to refresh when account changes." into nyc-mr1-dev

8 years agoReduce the number of times that dataset changed is triggerd in DashboardAdapter
Doris Ling [Tue, 12 Jul 2016 01:09:15 +0000 (18:09 -0700)]
Reduce the number of times that dataset changed is triggerd in DashboardAdapter

1. Save the suggestion list and the category list into the instance
state so that it will be available on warm start, and avoid the need
to reload the data.
2. Add the condition list to the constructor parameters for
DashboardAdapter, so that it does not need to setConditions()
separately which will trigger notifyDataSetChanged()

Bug: 30055644
Change-Id: Ia04fa3a25b13d2dacf6baf5f412d662a595fb6dd

8 years agoMerge \"Center find-sensor graphic in landscape\" into nyc-mr1-dev
Maurice Lam [Wed, 13 Jul 2016 00:04:39 +0000 (00:04 +0000)]
Merge \"Center find-sensor graphic in landscape\" into nyc-mr1-dev
am: 22f5b479b5

Change-Id: I8387a3cb6ae1977404356989449d374979a06214

8 years agoMerge "Center find-sensor graphic in landscape" into nyc-mr1-dev
Maurice Lam [Wed, 13 Jul 2016 00:00:54 +0000 (00:00 +0000)]
Merge "Center find-sensor graphic in landscape" into nyc-mr1-dev

8 years agoMerge \"Add ripples to negative buttons\" into nyc-mr1-dev
Maurice Lam [Tue, 12 Jul 2016 23:47:30 +0000 (23:47 +0000)]
Merge \"Add ripples to negative buttons\" into nyc-mr1-dev
am: 95f905b3c0

Change-Id: Ib15b4ab36db857773607ef3145fcabcac7a28314

8 years agoMerge \"Update preference ordering in Gestures settings.\" into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 23:44:14 +0000 (23:44 +0000)]
Merge \"Update preference ordering in Gestures settings.\" into nyc-mr1-dev
am: 22176641b2

Change-Id: Id3f021e78d5fe1d3e4522ae6c56e4a94e429903c

8 years agoMerge \"Update resource string for gestures settings.\" into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 23:44:13 +0000 (23:44 +0000)]
Merge \"Update resource string for gestures settings.\" into nyc-mr1-dev
am: 4410b6b663

Change-Id: I3e31e6276091c1d8562abf58d3208a842e6a60fe

8 years agoMerge "Add ripples to negative buttons" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 23:43:46 +0000 (23:43 +0000)]
Merge "Add ripples to negative buttons" into nyc-mr1-dev

8 years agoRequest support rules to refresh when account changes.
Fan Zhang [Tue, 12 Jul 2016 21:10:22 +0000 (14:10 -0700)]
Request support rules to refresh when account changes.

Bug: 30079512

When account is added, operation rule can potentially change. Request a
refresh to make sure user sees the latest UI.

Change-Id: I89e9d97bec22d612ca3602d86cc63f8f06355a39

8 years agoMerge "Update preference ordering in Gestures settings." into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 23:38:02 +0000 (23:38 +0000)]
Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev

8 years agoMerge "Update resource string for gestures settings." into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 23:37:38 +0000 (23:37 +0000)]
Merge "Update resource string for gestures settings." into nyc-mr1-dev

8 years agoAdd ripples to negative buttons
Maurice Lam [Tue, 12 Jul 2016 21:43:18 +0000 (14:43 -0700)]
Add ripples to negative buttons

For the negative buttons (buttons on the left side) of screen lock setup
and fingerprint setup screens, instead of theming it like a text link,
inherit from the borderless button and set the highlight color to color
accent.

Bug: 29905448
Change-Id: I4a3d28d4a0658740d0cb622e40031ab0ca22e6a0

8 years agoMerge \"Don\'t show the Fingerprint suggestion if it is disabled.\" into nyc-mr1-dev
Daniel Nishi [Tue, 12 Jul 2016 21:49:33 +0000 (21:49 +0000)]
Merge \"Don\'t show the Fingerprint suggestion if it is disabled.\" into nyc-mr1-dev
am: 8dc1a7340b

Change-Id: If6f0c6307b3c617b0c07c5cf9a69899ae893009c

8 years agoMerge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 21:42:03 +0000 (21:42 +0000)]
Merge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev

8 years agoMerge \"Use app name as summary in default home app setting.\" into nyc-mr1-dev
Fan Zhang [Tue, 12 Jul 2016 21:33:06 +0000 (21:33 +0000)]
Merge \"Use app name as summary in default home app setting.\" into nyc-mr1-dev
am: 0fd709bf44

Change-Id: Ie2ea62621d24f8c2d6867fb6b8f4c3b00c57333d

8 years agoMerge "Use app name as summary in default home app setting." into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 21:26:11 +0000 (21:26 +0000)]
Merge "Use app name as summary in default home app setting." into nyc-mr1-dev

8 years agoLog when the storage manager is toggled on and off.
Daniel Nishi [Tue, 12 Jul 2016 20:55:41 +0000 (13:55 -0700)]
Log when the storage manager is toggled on and off.

Bug: 30095915
Change-Id: I9fe16f842f2c2944582ec231803aa957573abead

8 years agoDon't show the Fingerprint suggestion if it is disabled.
Daniel Nishi [Mon, 11 Jul 2016 22:27:16 +0000 (15:27 -0700)]
Don't show the Fingerprint suggestion if it is disabled.

Bug: 27202317
Change-Id: I8e97e47f711961cf127fc2135dd06812236829b8

8 years agoUse app name as summary in default home app setting.
Fan Zhang [Mon, 11 Jul 2016 22:25:03 +0000 (15:25 -0700)]
Use app name as summary in default home app setting.

Bug: 27834147

Condition: Only use app name as summary if there is only 1 launcher app
installed.

Change-Id: Idb9b55d5618bbdbea6446758f2fcd09d0d6309af

8 years agoUpdate preference ordering in Gestures settings.
Doris Ling [Tue, 12 Jul 2016 18:25:47 +0000 (11:25 -0700)]
Update preference ordering in Gestures settings.

Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display

Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9

8 years agoImport translations. DO NOT MERGE am: fdb2a9ab61 -s ours
Bill Yi [Tue, 12 Jul 2016 16:53:42 +0000 (16:53 +0000)]
Import translations. DO NOT MERGE am: fdb2a9ab61  -s ours
am: f7e4533931  -s ours

Change-Id: Ie0091e08de1cd14903989b1a133cfeb3ddd2ed3f

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Tue, 12 Jul 2016 16:53:41 +0000 (16:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 7b2e48bc53  -s ours

Change-Id: Ib90da04c38aec52e7d8932f387ad477ade3807a8

8 years agoImport translations. DO NOT MERGE am: fdb2a9ab61 -s ours
Bill Yi [Tue, 12 Jul 2016 16:41:10 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am: fdb2a9ab61  -s ours
am: 60761866e5  -s ours

Change-Id: I0c8e63469275a91fe0b75b67062bb686cb055d3d

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 16:35:07 +0000 (16:35 +0000)]
Import translations. DO NOT MERGE
am: fdb2a9ab61  -s ours

Change-Id: I9e66dac2b329ad2f6065a5208b8da471b14f66e7

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 16:31:39 +0000 (16:31 +0000)]
Import translations. DO NOT MERGE
am: fdb2a9ab61  -s ours

Change-Id: Ica3d0c2c2fcc40034c93cd26e5596961dff32473

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:18:53 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \\\"Settings: add logpersist kernel only selection\\\" am: 3c60540078 am: bd900...
Mark Salyzyn [Tue, 12 Jul 2016 15:35:14 +0000 (15:35 +0000)]
Merge \\\"Settings: add logpersist kernel only selection\\\" am: 3c60540078 am: bd900c98ef
am: 364322a81d

Change-Id: I46f8b760043a4cafcb1798479f10a623776a0f7b

8 years agoMerge \\"Settings: add logpersist kernel only selection\\" am: 3c60540078
Mark Salyzyn [Tue, 12 Jul 2016 15:32:34 +0000 (15:32 +0000)]
Merge \\"Settings: add logpersist kernel only selection\\" am: 3c60540078
am: bd900c98ef

Change-Id: I4fea0151e3bf5fb9d0ee14a333eac4ddaa16c5f3

8 years agoMerge \"Settings: add logpersist kernel only selection\"
Mark Salyzyn [Tue, 12 Jul 2016 15:29:51 +0000 (15:29 +0000)]
Merge \"Settings: add logpersist kernel only selection\"
am: 3c60540078

Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b

8 years agoMerge "Settings: add logpersist kernel only selection"
Treehugger Robot [Tue, 12 Jul 2016 15:24:10 +0000 (15:24 +0000)]
Merge "Settings: add logpersist kernel only selection"

8 years agoSettings: trampoline persist.logd.logpersistd to logd.logpersistd
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd

- Deal with trampoline, where we read logd.logpersistd and
  logd.logpersistd.buffer, write to persist.logd.logpersistd and
  persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
  automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support

Bug: 28936216
Bug: 29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc

8 years agoSettings: add logpersist kernel only selection
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: add logpersist kernel only selection

Bug: 28936216
Bug: 29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973

8 years agoUse UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED
Mahaver Chopra [Sun, 10 Jul 2016 15:38:24 +0000 (16:38 +0100)]
Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED

Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.

Bug: 29893399
Change-Id: Icaffb080979a447d1e0f7f0d72f92c9db83ac10c

8 years agoMerge \"Correct logic for showing overide dnd field.\" into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 14:08:26 +0000 (14:08 +0000)]
Merge \"Correct logic for showing overide dnd field.\" into nyc-mr1-dev
am: 42d2fda721

Change-Id: I34ad6825441eb154fb767e24857119561b2855ed

8 years agoMerge "Correct logic for showing overide dnd field." into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 14:03:12 +0000 (14:03 +0000)]
Merge "Correct logic for showing overide dnd field." into nyc-mr1-dev

8 years agoRemove KeyboardView in ChooseLockPassword
Tony Mak [Tue, 12 Jul 2016 13:52:31 +0000 (13:52 +0000)]
Remove KeyboardView in ChooseLockPassword
am: 9c26c9dba6

Change-Id: I740daffa8a7e9c4d0fa686dc22043a9de518f473

8 years agoVisualize password requirements and their fulfillment
Tony Mak [Tue, 12 Jul 2016 13:52:31 +0000 (13:52 +0000)]
Visualize password requirements and their fulfillment
am: 0bbcdccdbf

Change-Id: Iad89b5aa1a94c12edeebf42be6c8c380f27bd4ff

8 years agoRemove KeyboardView in ChooseLockPassword
Tony Mak [Fri, 1 Jul 2016 12:55:47 +0000 (13:55 +0100)]
Remove KeyboardView in ChooseLockPassword

1. We actually use user installed keyboard
2. Request focus on the edittext instead of the keyboard

Bug: 24900754

Change-Id: I6257a592ad34875d46c5c05349098b891ef37d98

8 years agoVisualize password requirements and their fulfillment
Tony Mak [Tue, 12 Jul 2016 10:19:45 +0000 (11:19 +0100)]
Visualize password requirements and their fulfillment

1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
   Update the view accordingly.

Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix: 24900754

8 years agoUpdate work challenge strings
Tony Mak [Tue, 12 Jul 2016 07:04:17 +0000 (07:04 +0000)]
Update work challenge strings
am: 9a8e5a7f25

Change-Id: I767c864b9e96df909b03c5e0ce449125f89c3f83

8 years agoUpdate work challenge strings
Tony Mak [Tue, 5 Jul 2016 06:48:53 +0000 (07:48 +0100)]
Update work challenge strings

Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix: 29358023

8 years agoCenter find-sensor graphic in landscape
Maurice Lam [Tue, 12 Jul 2016 03:14:49 +0000 (20:14 -0700)]
Center find-sensor graphic in landscape

Center the find-sensor graphic in landscape so it can occupy the
space next to the title as well, preventing it from being cropped
when the font-size and display size is set to maximum.

Bug: 29516872
Change-Id: I3d2a6d0852ec725c99ba5709a97e532cd0338778

8 years agoMerge \"Update button styles for fingerprint\" into nyc-mr1-dev
Maurice Lam [Tue, 12 Jul 2016 02:01:46 +0000 (02:01 +0000)]
Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
am: 68d65abaaa

Change-Id: I718eb92c675f186b1450c378ce1c6589a862862b

8 years agoMerge "Update button styles for fingerprint" into nyc-mr1-dev
Maurice Lam [Tue, 12 Jul 2016 01:51:11 +0000 (01:51 +0000)]
Merge "Update button styles for fingerprint" into nyc-mr1-dev

8 years agoUpdate resource string for gestures settings.
Doris Ling [Mon, 11 Jul 2016 23:36:16 +0000 (16:36 -0700)]
Update resource string for gestures settings.

Update the summary text for the gestures settings.

Bug: 30074265
Change-Id: I5e4313f2764aa64af8bd7b984189f2d0782a0a70

8 years agoMerge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
Doris Ling [Mon, 11 Jul 2016 22:28:52 +0000 (22:28 +0000)]
Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
am: 709aa539c8

Change-Id: I164c244613a9d58b7e2f5ec37d144385d577ccdd

8 years agoMerge "Disable Gestures Settings by default." into nyc-mr1-dev
Doris Ling [Mon, 11 Jul 2016 22:21:25 +0000 (22:21 +0000)]
Merge "Disable Gestures Settings by default." into nyc-mr1-dev

8 years agoMerge \"Fix PIN screen title\" into nyc-mr1-dev
Maurice Lam [Mon, 11 Jul 2016 21:45:36 +0000 (21:45 +0000)]
Merge \"Fix PIN screen title\" into nyc-mr1-dev
am: 79321c480f

Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9

8 years agoMerge "Fix PIN screen title" into nyc-mr1-dev
Maurice Lam [Mon, 11 Jul 2016 21:33:04 +0000 (21:33 +0000)]
Merge "Fix PIN screen title" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 11 Jul 2016 19:53:47 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 11 Jul 2016 19:42:47 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDisable Gestures Settings by default.
Doris Ling [Mon, 11 Jul 2016 19:00:18 +0000 (12:00 -0700)]
Disable Gestures Settings by default.

Add a config boolean to determine if the gesture settings is enabled or
not.

Bug: 30022840
Change-Id: Ie7ae8bedbfc128b64999d33a3d626d4e311e5e3e

8 years agoMerge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
Makoto Onuki [Mon, 11 Jul 2016 18:09:18 +0000 (18:09 +0000)]
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
am: ed9aed1878

Change-Id: If095c72ed03bbae493259479c6b23a862e71db4c

8 years agoMerge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
Makoto Onuki [Mon, 11 Jul 2016 17:54:27 +0000 (17:54 +0000)]
Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev

8 years agoFix PIN screen title
Maurice Lam [Sat, 9 Jul 2016 01:38:48 +0000 (18:38 -0700)]
Fix PIN screen title

Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".

Bug: 30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d

8 years agoMerge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
Victor Chang [Mon, 11 Jul 2016 14:08:09 +0000 (14:08 +0000)]
Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
am: 9505b78e29

Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa

8 years agoMerge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
Victor Chang [Mon, 11 Jul 2016 13:56:07 +0000 (13:56 +0000)]
Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev

8 years agoCorrect logic for showing overide dnd field.
Julia Reynolds [Mon, 11 Jul 2016 13:05:44 +0000 (09:05 -0400)]
Correct logic for showing overide dnd field.

Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes: 29995563

8 years agoMerge \"Add handling for gesture settings for double twist for camera flip.\" into...
Doris Ling [Sat, 9 Jul 2016 00:03:11 +0000 (00:03 +0000)]
Merge \"Add handling for gesture settings for double twist for camera flip.\" into nyc-mr1-dev
am: 94c8f7ea7e

Change-Id: I28cec18b2f9df53b0a48f7668311e1d4120cb636

8 years agoMerge "Add handling for gesture settings for double twist for camera flip." into...
Doris Ling [Fri, 8 Jul 2016 23:58:45 +0000 (23:58 +0000)]
Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev

8 years agoMerge \"Change gesture settings for Ambient Display from nudge to double tap.\" into...
Doris Ling [Fri, 8 Jul 2016 23:23:35 +0000 (23:23 +0000)]
Merge \"Change gesture settings for Ambient Display from nudge to double tap.\" into nyc-mr1-dev
am: 8ba6e6a792

Change-Id: Ib76c7172feddc578c4f276098e58c050cd4c6f8e

8 years agoMerge "Change gesture settings for Ambient Display from nudge to double tap." into...
Doris Ling [Fri, 8 Jul 2016 23:16:36 +0000 (23:16 +0000)]
Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev

8 years agoMerge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 23:03:44 +0000 (23:03 +0000)]
Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev
am: f46dabcf0f

Change-Id: I1754736fb69495e5601b2e13038e30df1482b792

8 years agoMerge "Add summary for Settings->Gestures." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 22:56:45 +0000 (22:56 +0000)]
Merge "Add summary for Settings->Gestures." into nyc-mr1-dev

8 years agoMerge \\\"Settings: add logpersist kernel only selection (strings)\\\" am: fd021e203d...
Mark Salyzyn [Fri, 8 Jul 2016 21:29:15 +0000 (21:29 +0000)]
Merge \\\"Settings: add logpersist kernel only selection (strings)\\\" am: fd021e203d  -s ours am: a79d854fb6
am: f8da6eca1c

Change-Id: Ic56f36df562ded8e353977b1d468732414b9c5eb

8 years agoMerge \\"Settings: add logpersist kernel only selection (strings)\\" am: fd021e203d...
Mark Salyzyn [Fri, 8 Jul 2016 21:26:51 +0000 (21:26 +0000)]
Merge \\"Settings: add logpersist kernel only selection (strings)\\" am: fd021e203d  -s ours
am: a79d854fb6

Change-Id: I06daa419b00c21c3ed981ff674023e3d1d5b1719

8 years agoChange gesture settings for Ambient Display from nudge to double tap.
Doris Ling [Fri, 8 Jul 2016 19:42:13 +0000 (12:42 -0700)]
Change gesture settings for Ambient Display from nudge to double tap.

Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.

Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee

8 years agoMerge \"Settings: add logpersist kernel only selection (strings)\"
Mark Salyzyn [Fri, 8 Jul 2016 21:24:24 +0000 (21:24 +0000)]
Merge \"Settings: add logpersist kernel only selection (strings)\"
am: fd021e203d  -s ours

Change-Id: I3eebcf646fa289462caf57b51846cee93a7774c0

8 years agoMerge \"Add Night display settings\" into nyc-mr1-dev
Justin Klaassen [Fri, 8 Jul 2016 21:15:39 +0000 (21:15 +0000)]
Merge \"Add Night display settings\" into nyc-mr1-dev
am: e577ed1b91

Change-Id: I2d3aa5fdd00ccf0fe5dbb55468504b59cc8c8bbb

8 years agoAdd summary for Settings->Gestures.
Doris Ling [Fri, 8 Jul 2016 18:35:27 +0000 (11:35 -0700)]
Add summary for Settings->Gestures.

Add summary text for gesture settings.

Bug: 30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02

8 years agoMerge "Add Night display settings" into nyc-mr1-dev
Justin Klaassen [Fri, 8 Jul 2016 21:07:47 +0000 (21:07 +0000)]
Merge "Add Night display settings" into nyc-mr1-dev

8 years agoMerge "Settings: add logpersist kernel only selection (strings)"
Mark Salyzyn [Fri, 8 Jul 2016 21:06:29 +0000 (21:06 +0000)]
Merge "Settings: add logpersist kernel only selection (strings)"

8 years agoUI updates for support tab.
Fan Zhang [Fri, 8 Jul 2016 19:21:26 +0000 (19:21 +0000)]
UI updates for support tab.
am: 48aab452cb

Change-Id: I7d2bb55979e6b2a4dfe944552fe9a50a184fe573

8 years agoAdd Night display settings
Justin Klaassen [Wed, 22 Jun 2016 01:32:04 +0000 (18:32 -0700)]
Add Night display settings

Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e

8 years agoSettings: add logpersist kernel only selection (strings)
Mark Salyzyn [Thu, 7 Jul 2016 18:30:32 +0000 (11:30 -0700)]
Settings: add logpersist kernel only selection (strings)

Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503

8 years agoAdd handling for gesture settings for double twist for camera flip.
Doris Ling [Wed, 6 Jul 2016 20:44:26 +0000 (13:44 -0700)]
Add handling for gesture settings for double twist for camera flip.

Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.

Bug: 29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26

8 years agoUI updates for support tab.
Fan Zhang [Thu, 7 Jul 2016 23:44:05 +0000 (16:44 -0700)]
UI updates for support tab.

Fixes: 29999181
Fixes: 29397123

- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
  always avaiable.

Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4

8 years agoRestore "reset ShortcutManager rate limiting" dev option
Makoto Onuki [Fri, 8 Jul 2016 16:17:25 +0000 (09:17 -0700)]
Restore "reset ShortcutManager rate limiting" dev option

Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72

8 years agoMerge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 21:01:56 +0000 (21:01 +0000)]
Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
am: 96bc7b5d03

Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811

8 years agoMerge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 20:30:00 +0000 (20:30 +0000)]
Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev

8 years agoMerge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 17:11:12 +0000 (17:11 +0000)]
Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536

8 years agoMerge "Add padding for the animation in the gestures settings." into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 16:58:40 +0000 (16:58 +0000)]
Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev

8 years agoFix strings for support tab.
Fan Zhang [Thu, 7 Jul 2016 15:37:23 +0000 (15:37 +0000)]
Fix strings for support tab.
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb

8 years agoFix strings for support tab.
Fan Zhang [Thu, 7 Jul 2016 00:07:37 +0000 (17:07 -0700)]
Fix strings for support tab.

Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa

8 years agoWrap bluetooth edit content in a scrollview.
Fan Zhang [Wed, 6 Jul 2016 23:40:34 +0000 (16:40 -0700)]
Wrap bluetooth edit content in a scrollview.

Bug: 28914094

In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.

Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640

8 years agoMerge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 00:20:59 +0000 (00:20 +0000)]
Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
am: 071f62954d

Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69