OSDN Git Service
Maurice Lam [Sat, 26 Jul 2014 01:49:37 +0000 (01:49 +0000)]
am
2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
* commit '
2d4d9a9067a2904ed75247f83b0f37a086a020b2':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
Maurice Lam [Fri, 18 Jul 2014 01:36:56 +0000 (18:36 -0700)]
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
Do not create the assistant card if we are in WifiPickerActivity,
which includes setup wizard and account login.
Bug:
16382431
Change-Id: Id5eaa8040eafe5222e1a5c9276a2a10bedebfd71
Fabrice Di Meglio [Fri, 25 Jul 2014 23:49:24 +0000 (23:49 +0000)]
am
096c0c46: Merge "Implement #
15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
* commit '
096c0c46fb8cbdfeb05cdfb19d8c98b06403a18d':
Implement #
15841213 Search - index Developer Option only and only if they have been activated
Fabrice Di Meglio [Fri, 25 Jul 2014 20:17:20 +0000 (20:17 +0000)]
am
a6dbeae6: Merge "Fix bug #
16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
* commit '
a6dbeae65f3c7e924adf5027469064660ba9e825':
Fix bug #
16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
Alan Viverette [Fri, 25 Jul 2014 19:46:56 +0000 (19:46 +0000)]
am
06363397: Remove -opia color correction modes
* commit '
063633971283a2dd342fc032d3cef65d03de0125':
Remove -opia color correction modes
Alan Viverette [Fri, 25 Jul 2014 17:12:20 +0000 (10:12 -0700)]
Remove -opia color correction modes
The implementations for these are identical to -omaly modes.
Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
Paul Lawrence [Fri, 25 Jul 2014 18:47:41 +0000 (18:47 +0000)]
am
0ee45d5b: Fix Trusted Credentials layout
* commit '
0ee45d5bdc559ba7746dc803429268e8b6dd2092':
Fix Trusted Credentials layout
Fabrice Di Meglio [Fri, 25 Jul 2014 18:47:40 +0000 (18:47 +0000)]
am
dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
* commit '
dec811201f079a48e357f99532996b42406fd5af':
Enforce the presence of the Indexable interface for Indexing
Paul Lawrence [Fri, 25 Jul 2014 16:45:38 +0000 (09:45 -0700)]
Fix Trusted Credentials layout
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape
Bug:
16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
Amith Yamasani [Fri, 25 Jul 2014 16:46:48 +0000 (16:46 +0000)]
am
2d578ce2: Don\'t use the profile info for name
* commit '
2d578ce29391dc72fde7330ff9ff909347ec531b':
Don't use the profile info for name
Amith Yamasani [Fri, 25 Jul 2014 16:37:33 +0000 (09:37 -0700)]
Don't use the profile info for name
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.
Bug:
15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
Fabrice Di Meglio [Fri, 25 Jul 2014 03:03:43 +0000 (03:03 +0000)]
am
8610ff9e: Merge "Fix Preferences background color" into lmp-dev
* commit '
8610ff9ea678201920bf6fb7d3a2b141226f6640':
Fix Preferences background color
Fabrice Di Meglio [Thu, 24 Jul 2014 23:23:55 +0000 (23:23 +0000)]
am
a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
* commit '
a8469d285e1956e2a90a4475ad6e5981dee34223':
More fixes for QuickLaunchSettings
Amith Yamasani [Thu, 24 Jul 2014 23:23:54 +0000 (23:23 +0000)]
am
ee398747: Refactor User Profile editor dialog for reuse
* commit '
ee3987475e1d29e8355bdb9e068149eb01e3fd43':
Refactor User Profile editor dialog for reuse
Amith Yamasani [Thu, 24 Jul 2014 21:13:36 +0000 (14:13 -0700)]
Refactor User Profile editor dialog for reuse
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.
Bug:
15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
rich cannings [Thu, 24 Jul 2014 22:47:13 +0000 (22:47 +0000)]
am
b8684d57: Remove "Verify apps" from Security settings
* commit '
b8684d573e1357ee573f26d511a630b39e368d0f':
Remove "Verify apps" from Security settings
Fabrice Di Meglio [Fri, 25 Jul 2014 23:43:15 +0000 (23:43 +0000)]
Merge "Implement #
15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
Fabrice Di Meglio [Fri, 25 Jul 2014 23:28:53 +0000 (16:28 -0700)]
Implement #
15841213 Search - index Developer Option only and only if they have been activated
- do not index Developer Options if they are not activated
- index them just after their activation
Change-Id: I54fcc6b55a1f29eb6b19d6e14e3158d4a38a6fe6
Fabrice Di Meglio [Fri, 25 Jul 2014 20:03:09 +0000 (13:03 -0700)]
Fix bug #
16533532 Settings app crashes on device orientation change
...when "change language" warning dialog is on screen
- try harder at getting the parent fragment. First try by calling
getParentFragment() and if this is getting a null reference, try
again by using the fragment Id saved during onSaveInstanceState()
Change-Id: I3dbc6a229224c8770ff2c7e432e76b8796c4b099
Fabrice Di Meglio [Fri, 25 Jul 2014 02:53:47 +0000 (19:53 -0700)]
Enforce the presence of the Indexable interface for Indexing
- check that the Indexable interface has been defined before indexing
Change-Id: Ia61915b2bd1240226ba560ecfd883a115b49da95
Fabrice Di Meglio [Fri, 25 Jul 2014 00:03:04 +0000 (17:03 -0700)]
Fix Preferences background color
- use #
FFFAFAFA instead of pure white
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
Fabrice Di Meglio [Thu, 24 Jul 2014 22:46:35 +0000 (15:46 -0700)]
More fixes for QuickLaunchSettings
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme
Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
Fabrice Di Meglio [Fri, 25 Jul 2014 18:07:34 +0000 (18:07 +0000)]
Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
rich cannings [Mon, 21 Jul 2014 23:12:49 +0000 (16:12 -0700)]
Remove "Verify apps" from Security settings
The setting moved to Google settings
Bug:
15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
Fabrice Di Meglio [Fri, 25 Jul 2014 02:59:33 +0000 (02:59 +0000)]
Merge "Fix Preferences background color" into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:52:43 +0000 (21:52 +0000)]
am
c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
Import translations. DO NOT MERGE
Paul Lawrence [Thu, 24 Jul 2014 21:52:43 +0000 (21:52 +0000)]
am
832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
* commit '
832ad7206299be6db94e82e2387c0fcf8df53e7e':
Show countdown of remaining decrypt attempts before wiping device
Fabrice Di Meglio [Thu, 24 Jul 2014 21:26:47 +0000 (21:26 +0000)]
am
6cef9d23: Merge "Fix bug #
16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
* commit '
6cef9d23b8572d8bd87329999f10286e29a861c0':
Fix bug #
16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
Fabrice Di Meglio [Thu, 24 Jul 2014 03:03:20 +0000 (20:03 -0700)]
Fix bug #
16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
- make it work again (what a code...)
Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
Baligh Uddin [Thu, 24 Jul 2014 21:46:51 +0000 (21:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 09:51:46 +0000 (02:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
Paul Lawrence [Thu, 24 Jul 2014 21:45:01 +0000 (21:45 +0000)]
Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
Adam Lesinski [Thu, 24 Jul 2014 20:30:37 +0000 (20:30 +0000)]
am
468d3916: Implement the Usage Access Settings UI
* commit '
468d39160fd417cf23cba3d592acb349d3f59c55':
Implement the Usage Access Settings UI
Adam Lesinski [Tue, 22 Jul 2014 17:01:08 +0000 (10:01 -0700)]
Implement the Usage Access Settings UI
Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.
Bug:
16461070
Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9
PauloftheWest [Thu, 24 Jul 2014 20:02:57 +0000 (20:02 +0000)]
am
28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
* commit '
28fc05a12bc26c79be697c347dd2930094900744':
Added SIM Card Activity to Settings
PauloftheWest [Thu, 24 Jul 2014 18:51:10 +0000 (18:51 +0000)]
am
958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
* commit '
958d1ee6d584b7489d57071305c44635a0534ba9':
Fixed an illustrious NullPointer bug on Wifi Assistant
Paul Lawrence [Wed, 23 Jul 2014 20:57:17 +0000 (13:57 -0700)]
Show countdown of remaining decrypt attempts before wiping device
Bug:
16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
Fabrice Di Meglio [Thu, 24 Jul 2014 23:22:11 +0000 (23:22 +0000)]
Merge "More fixes for QuickLaunchSettings" into lmp-dev
PauloftheWest [Thu, 24 Jul 2014 18:46:07 +0000 (18:46 +0000)]
Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
PauloftheWest [Thu, 24 Jul 2014 18:40:21 +0000 (11:40 -0700)]
Fixed an illustrious NullPointer bug on Wifi Assistant
+ The class was never instantiated...
Bug:
16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b
Fabrice Di Meglio [Fri, 25 Jul 2014 20:10:34 +0000 (20:10 +0000)]
Merge "Fix bug #
16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
Fabrice Di Meglio [Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)]
Merge "Fix bug #
16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
PauloftheWest [Thu, 24 Jul 2014 19:59:03 +0000 (19:59 +0000)]
Merge "Added SIM Card Activity to Settings" into lmp-dev
John Spurlock [Thu, 24 Jul 2014 15:31:02 +0000 (15:31 +0000)]
am
a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
* commit '
a8e0a5b5f9a1d9fbade91909d57eb431fed69a86':
Settings: Add to the zen alarm string.
Paul Lawrence [Thu, 24 Jul 2014 15:15:09 +0000 (15:15 +0000)]
am
e68f5224: Show correct string when prompting for pattern before encrypting
* commit '
e68f5224e4359aef7f62c94130d5b9b221bee389':
Show correct string when prompting for pattern before encrypting
Paul Lawrence [Wed, 23 Jul 2014 21:14:53 +0000 (14:14 -0700)]
Show correct string when prompting for pattern before encrypting
Bug:
16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
PauloftheWest [Mon, 30 Jun 2014 17:02:36 +0000 (10:02 -0700)]
Added SIM Card Activity to Settings
+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS
Bug:
16241745
Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d
Alexandra Gherghina [Thu, 24 Jul 2014 12:51:08 +0000 (12:51 +0000)]
am
2513851a: Adds cross-profile intents for Settings screens.
* commit '
2513851ace8d353f99146316b81a430add6d837f':
Adds cross-profile intents for Settings screens.
Alexandra Gherghina [Mon, 21 Jul 2014 21:42:21 +0000 (22:42 +0100)]
Adds cross-profile intents for Settings screens.
This is needed for settings that are handled in the primary profile app.
Bug:
16369104
Change-Id: If3ec3866778282219267481b8f419774f7f2c9de
Alexandra Gherghina [Thu, 24 Jul 2014 12:27:14 +0000 (12:27 +0000)]
am
377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev
* commit '
377b8df3ed89f2e61b6755aee8136754a2edf9c5':
Checks if the right user has a restriction
Fabrice Di Meglio [Thu, 24 Jul 2014 02:41:04 +0000 (02:41 +0000)]
am
76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev
* commit '
76f5c3bc722b7450870c586bffef1688e96607b7':
More code cleaning for the Home intent filters
Fabrice Di Meglio [Thu, 24 Jul 2014 02:10:29 +0000 (02:10 +0000)]
am
87915ea0: Merge "Code cleaning" into lmp-dev
* commit '
87915ea074c62b591a2f9967c57ab21412c6cae8':
Code cleaning
Fabrice Di Meglio [Thu, 24 Jul 2014 01:31:21 +0000 (01:31 +0000)]
am
456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev
* commit '
456229ccdfb6ddb8cd1ac3be939e1c2221f4bedd':
Fix how Home Activities are refreshed
Fabrice Di Meglio [Wed, 23 Jul 2014 23:35:57 +0000 (23:35 +0000)]
am
1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
* commit '
1e9405b5cc35d598507fccdfa0e833ab83b2cfd9':
Add Settings Dashboard refresh for Home activities
Jim Miller [Wed, 23 Jul 2014 23:23:58 +0000 (23:23 +0000)]
am
dfd2c6f2: Change wording in keyguard settings menu.
* commit '
dfd2c6f261df4d5de5111524bd6205406d0e72db':
Change wording in keyguard settings menu.
Jim Miller [Wed, 23 Jul 2014 23:01:06 +0000 (16:01 -0700)]
Change wording in keyguard settings menu.
Fixes bug
15167729
Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
Maurice Lam [Wed, 23 Jul 2014 23:03:29 +0000 (23:03 +0000)]
am
56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
* commit '
56d781b32b7aad0fb0bb41aae26ce896f1fedfdc':
[WifiSetup] Tablet landscape layout
Fabrice Di Meglio [Wed, 23 Jul 2014 22:44:41 +0000 (22:44 +0000)]
am
56fc6a75: Merge "Code cleaning for Index" into lmp-dev
* commit '
56fc6a75302c8525e45d6898901f45b0de526944':
Code cleaning for Index
PauloftheWest [Wed, 23 Jul 2014 21:55:25 +0000 (21:55 +0000)]
am
d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev
* commit '
d89febb6deebc681063eacbf95dbe4fdfb8533e5':
Fixed bug where multiple access points would show connected
Alan Viverette [Wed, 23 Jul 2014 21:47:04 +0000 (21:47 +0000)]
am
68419fca: Merge "Use activity for brightness dialog" into lmp-dev
* commit '
68419fca2d03b8c5afd9f5dfecef8a4415ff063d':
Use activity for brightness dialog
Dianne Hackborn [Wed, 23 Jul 2014 21:43:17 +0000 (21:43 +0000)]
am
f151ea34: Merge "Work on issue #
16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev
* commit '
f151ea34824105068ebadae43fe165e79587f9f6':
Work on issue #
16135174: Apps page "smoke" gradient footer must be removed
Julia Reynolds [Wed, 23 Jul 2014 21:22:51 +0000 (21:22 +0000)]
am
1a0297c5: Use restrictionsprovider framework in Settings.
* commit '
1a0297c544cb15ed4b56e70575b169b3889543b7':
Use restrictionsprovider framework in Settings.
Julia Reynolds [Wed, 18 Jun 2014 13:23:15 +0000 (09:23 -0400)]
Use restrictionsprovider framework in Settings.
Bug:
15305103
Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
Fabrice Di Meglio [Wed, 23 Jul 2014 20:41:33 +0000 (20:41 +0000)]
am
289a63f5: Merge "Fix NotificationStation theming" into lmp-dev
* commit '
289a63f509972372e37fc95de630a5410b4ebd5c':
Fix NotificationStation theming
Fabrice Di Meglio [Wed, 23 Jul 2014 20:19:36 +0000 (20:19 +0000)]
am
a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev
* commit '
a79400defc90a65437589cd5ede8de291692c75f':
Code cleaning for NotificationStation
Fabrice Di Meglio [Wed, 23 Jul 2014 19:56:46 +0000 (19:56 +0000)]
am
6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev
* commit '
6cad255000e2bff5475e0816d18e4b0b68481283':
OwnerInfos code cleaning
John Spurlock [Wed, 23 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am
d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
* commit '
d39d731473efbc84ec5640d89d0f275c759b3402':
Settings: Wire up Display > Lift to wake.
Alexandra Gherghina [Thu, 24 Jul 2014 12:21:41 +0000 (12:21 +0000)]
Merge "Checks if the right user has a restriction" into lmp-dev
Alexandra Gherghina [Wed, 23 Jul 2014 21:07:03 +0000 (22:07 +0100)]
Checks if the right user has a restriction
Bug:
15466880
Change-Id: I9199c6054e9955a90958fd3a751f321cf6fa9990
Maurice Lam [Wed, 23 Jul 2014 23:00:41 +0000 (23:00 +0000)]
Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
Maurice Lam [Fri, 18 Jul 2014 03:35:15 +0000 (20:35 -0700)]
[WifiSetup] Tablet landscape layout
Created setup_preference for sw600dp-land, modeled after
template_with_header in Setup Wizard. Copied over wide illustration,
which is again a placeholder and needs real graphics from UX.
Renamed SetupWizardHeader to SetupWizardIllustration. Added
aspectRatio attribute to SetupWizardIllustration that, will set the
aspect ratio of the top padding. If 0 or not specified, padding will
not be set.
Bug:
16349429
Change-Id: Ic2623ee0c0ee8864383d22da006b418b8c371bf0
Fabrice Di Meglio [Wed, 23 Jul 2014 22:39:10 +0000 (22:39 +0000)]
Merge "Code cleaning for Index" into lmp-dev
Fabrice Di Meglio [Wed, 23 Jul 2014 22:22:44 +0000 (15:22 -0700)]
Code cleaning for Index
- make that UpdateData class static
Change-Id: I22ac148613fcaa4ed3ad615c4eca037b5dc6b986
Fabrice Di Meglio [Wed, 23 Jul 2014 20:31:26 +0000 (13:31 -0700)]
Fix NotificationStation theming
- fix padding for the ListView
- fix ActionBar size
- remove non needed switchBarMargins
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I0e3d3116f2ee749a04a8a464b36fa68909edf11d
Fabrice Di Meglio [Wed, 23 Jul 2014 20:07:52 +0000 (13:07 -0700)]
Code cleaning for NotificationStation
- remove dead code and vars
- log exceptions
Change-Id: Idff91c27620955a3458c2358b629331e140aedba
Fabrice Di Meglio [Wed, 23 Jul 2014 18:25:53 +0000 (11:25 -0700)]
OwnerInfos code cleaning
Change-Id: I5f4e5dcee4af672fa11f552544bfcf4506a21258
Fabrice Di Meglio [Thu, 24 Jul 2014 02:07:56 +0000 (02:07 +0000)]
Merge "Code cleaning" into lmp-dev
Fabrice Di Meglio [Thu, 24 Jul 2014 02:03:33 +0000 (19:03 -0700)]
Code cleaning
- remove those non usefull Intent.CATEGORY_LAUNCHER
Change-Id: Ib6e5f4a5265633da85423307fac26a104814f05f
Fabrice Di Meglio [Thu, 24 Jul 2014 01:15:42 +0000 (18:15 -0700)]
Fix how Home Activities are refreshed
- remove that HomePackageReceiver from the AndroidManifest
that could force Settings to run
- use a HomePackageReceiver into HomeSettings and DashboardSummary
- fix also the BatteryInfoReceiver for refreshing the Dashboard
Change-Id: Id3891529fc176e7e4c450f2ce723f8ac2af66c58
Fabrice Di Meglio [Wed, 23 Jul 2014 23:25:30 +0000 (16:25 -0700)]
Add Settings Dashboard refresh for Home activities
- cache the number of Home activities into mHomeActivitiesCount
- save and restore its value
- use its value for triggering refresh of the Dashboard
Change-Id: Ibc228b9b26c3515bba89ab17c7d39531125e8df8
Fabrice Di Meglio [Thu, 24 Jul 2014 01:25:38 +0000 (01:25 +0000)]
Merge "Fix how Home Activities are refreshed" into lmp-dev
Fabrice Di Meglio [Wed, 23 Jul 2014 23:31:37 +0000 (23:31 +0000)]
Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
Fabrice Di Meglio [Thu, 24 Jul 2014 02:37:12 +0000 (02:37 +0000)]
Merge "More code cleaning for the Home intent filters" into lmp-dev
Fabrice Di Meglio [Thu, 24 Jul 2014 02:32:57 +0000 (19:32 -0700)]
More code cleaning for the Home intent filters
- remove the Intent.CATEGORY_HOME as it is not useful and
cannot be used into an Intent filter
Change-Id: I516188ea1c662c3277c64194c229a2e1c03a4e6a
PauloftheWest [Wed, 23 Jul 2014 21:52:31 +0000 (21:52 +0000)]
Merge "Fixed bug where multiple access points would show connected" into lmp-dev
PauloftheWest [Wed, 23 Jul 2014 21:24:56 +0000 (14:24 -0700)]
Fixed bug where multiple access points would show connected
Bug:
16236217
Change-Id: I0d95c753025f0787ca03876bab1fb66ec7916bf7
Alan Viverette [Wed, 23 Jul 2014 21:41:38 +0000 (21:41 +0000)]
Merge "Use activity for brightness dialog" into lmp-dev
Dianne Hackborn [Wed, 23 Jul 2014 21:38:14 +0000 (21:38 +0000)]
Merge "Work on issue #
16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev
Dianne Hackborn [Wed, 23 Jul 2014 20:38:41 +0000 (13:38 -0700)]
Work on issue #
16135174: Apps page "smoke" gradient footer must be removed
New header in running services. Not yet done.
Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e
Fabrice Di Meglio [Wed, 23 Jul 2014 20:37:39 +0000 (20:37 +0000)]
Merge "Fix NotificationStation theming" into lmp-dev
Fabrice Di Meglio [Wed, 23 Jul 2014 20:14:46 +0000 (20:14 +0000)]
Merge "Code cleaning for NotificationStation" into lmp-dev
Fabrice Di Meglio [Wed, 23 Jul 2014 19:53:04 +0000 (19:53 +0000)]
Merge "OwnerInfos code cleaning" into lmp-dev
John Spurlock [Thu, 24 Jul 2014 15:26:16 +0000 (15:26 +0000)]
Merge "Settings: Add to the zen alarm string." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 15:24:18 +0000 (11:24 -0400)]
Settings: Add to the zen alarm string.
Bug:
16406214
Change-Id: I9112c93fdee847633f9e5fb79129a3b02af4439e
John Spurlock [Wed, 23 Jul 2014 19:17:22 +0000 (19:17 +0000)]
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
PauloftheWest [Wed, 23 Jul 2014 17:19:43 +0000 (17:19 +0000)]
am
564282a3: Merge "Character limit updates" into lmp-dev
* commit '
564282a3f4645cf50aedd3cc809debe4f77a586b':
Character limit updates
John Spurlock [Wed, 23 Jul 2014 17:01:21 +0000 (13:01 -0400)]
Settings: Wire up Display > Lift to wake.
Bug:
15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
Julia Reynolds [Wed, 23 Jul 2014 14:54:04 +0000 (14:54 +0000)]
am
baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev
* commit '
baffc8892440bcdf43c90aa74e301bd3d16a795a':
Lockdown 'remove user' with user restriction in Settings for phones.
Paul Lawrence [Wed, 23 Jul 2014 14:43:36 +0000 (14:43 +0000)]
am
7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets
* commit '
7ae20e3ce98543888cfccbef6b1254d060bc30ca':
Allow CryptKeeper dialogs to rotate on tablets
Paul Lawrence [Tue, 22 Jul 2014 22:00:50 +0000 (15:00 -0700)]
Allow CryptKeeper dialogs to rotate on tablets
Tablets may be used in docking stations thus need to support landscape mode.
Phones will not be, and having them rotate is both ugly and annoying.
Also this matches lock screen behavior.
The attribute screenOrientation is not themeable, so the only way of doing
this is programmatic.
Test for truth of bool which is only set for sw600dp devices and
clear the nosensor setting from the manifest if set.
Bug:
16405551
Change-Id: I5b3f945b89402e5aa39642c2c06e98f9ca1ce298