OSDN Git Service
Paul Lawrence [Thu, 24 Jul 2014 23:31:06 +0000 (23:31 +0000)]
am
741bad53: am
e68f5224: Show correct string when prompting for pattern before encrypting
* commit '
741bad53a060700b639f4a061e0f63702224bb39':
Show correct string when prompting for pattern before encrypting
Alexandra Gherghina [Thu, 24 Jul 2014 23:30:49 +0000 (23:30 +0000)]
am
214712dd: am
2513851a: Adds cross-profile intents for Settings screens.
* commit '
214712dda0a9ecea1af609b0e1029cbf627e73aa':
Adds cross-profile intents for Settings screens.
Alexandra Gherghina [Thu, 24 Jul 2014 23:30:48 +0000 (23:30 +0000)]
am
2a459d30: am
377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev
* commit '
2a459d300850d98adf5d2d47f051e9a17d7c669e':
Checks if the right user has a restriction
Fabrice Di Meglio [Thu, 24 Jul 2014 19:48:10 +0000 (19:48 +0000)]
am
e2953d9f: am
76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev
* commit '
e2953d9f5fcee4cb4d84911e3e7e0f75c521bfb2':
More code cleaning for the Home intent filters
Fabrice Di Meglio [Thu, 24 Jul 2014 19:47:58 +0000 (19:47 +0000)]
am
d2f47cc2: am
87915ea0: Merge "Code cleaning" into lmp-dev
* commit '
d2f47cc243ae64568f737023e450b03a40ea72c5':
Code cleaning
Fabrice Di Meglio [Thu, 24 Jul 2014 19:47:30 +0000 (19:47 +0000)]
am
e0c5dd07: am
456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev
* commit '
e0c5dd07979b57940264f1b72957bd84ecb88740':
Fix how Home Activities are refreshed
Fabrice Di Meglio [Thu, 24 Jul 2014 19:46:30 +0000 (19:46 +0000)]
am
b90ce51c: am
1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
* commit '
b90ce51c3dd222cc761d5bd01ffff2039b976224':
Add Settings Dashboard refresh for Home activities
Jim Miller [Thu, 24 Jul 2014 19:46:26 +0000 (19:46 +0000)]
am
18be821a: am
dfd2c6f2: Change wording in keyguard settings menu.
* commit '
18be821acacd14cd7e8425c53095e8a2f4bd2b69':
Change wording in keyguard settings menu.
Maurice Lam [Thu, 24 Jul 2014 19:46:24 +0000 (19:46 +0000)]
am
7fbde725: am
56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
* commit '
7fbde72593b42d452ac492c00845b097efa8f0b4':
[WifiSetup] Tablet landscape layout
Fabrice Di Meglio [Thu, 24 Jul 2014 19:46:08 +0000 (19:46 +0000)]
am
fd45a5c6: am
56fc6a75: Merge "Code cleaning for Index" into lmp-dev
* commit '
fd45a5c6352d734b7cf27e8da6e6f133f364612c':
Code cleaning for Index
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
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 22:00:48 +0000 (22:00 +0000)]
am
ac1dedaf: am
d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev
* commit '
ac1dedafa197624568b6959c5b497b877791d9dc':
Fixed bug where multiple access points would show connected
Alan Viverette [Wed, 23 Jul 2014 21:55:52 +0000 (21:55 +0000)]
am
8f866a5a: am
68419fca: Merge "Use activity for brightness dialog" into lmp-dev
* commit '
8f866a5a941bf2e6db587bfbc826fa3b3fccc748':
Use activity for brightness dialog
Dianne Hackborn [Wed, 23 Jul 2014 21:55:39 +0000 (21:55 +0000)]
am
cc20a5b1: am
f151ea34: Merge "Work on issue #
16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev
* commit '
cc20a5b1fee8081582abd782d6f871e99e18e8b9':
Work on issue #
16135174: Apps page "smoke" gradient footer must be removed
Julia Reynolds [Wed, 23 Jul 2014 21:55:33 +0000 (21:55 +0000)]
am
e4e607a3: am
1a0297c5: Use restrictionsprovider framework in Settings.
* commit '
e4e607a3832a4894419c96726361a752a435fe70':
Use restrictionsprovider framework in Settings.
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:45:14 +0000 (20:45 +0000)]
am
5f71155c: am
289a63f5: Merge "Fix NotificationStation theming" into lmp-dev
* commit '
5f71155cbc4e677a7bac07296154deef89592e22':
Fix NotificationStation theming
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:24:13 +0000 (20:24 +0000)]
am
2f2a23de: am
a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev
* commit '
2f2a23dee368e04995211994defd72eb8f406a3c':
Code cleaning for NotificationStation
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 20:01:25 +0000 (20:01 +0000)]
am
c95775b5: am
6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev
* commit '
c95775b543366e36e652c7d5f04e5b21121053f9':
OwnerInfos code cleaning
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:28:01 +0000 (19:28 +0000)]
am
5c399368: am
d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
* commit '
5c3993682ab792d7a98792d30181a32e8cb96548':
Settings: Wire up Display > Lift to wake.
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 [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:24:11 +0000 (17:24 +0000)]
am
b6e74d86: am
564282a3: Merge "Character limit updates" into lmp-dev
* commit '
b6e74d867cc966ea80e6f0e7fbecda635a3bc5b0':
Character limit updates
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:58:10 +0000 (14:58 +0000)]
am
5a9e9a2e: am
baffc889: Merge "Lockdown \'remove user\' with user restriction in Settings for phones." into lmp-dev
* commit '
5a9e9a2ebd2deee9a3b3fea11e8639ee00a1c62f':
Lockdown 'remove user' with user restriction in Settings for phones.
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:46:41 +0000 (14:46 +0000)]
am
ff3f9cf2: am
7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets
* commit '
ff3f9cf279bcfaab8597fcbaaa22dabc8c0f497d':
Allow CryptKeeper dialogs to rotate on tablets
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
Narayan Kamath [Wed, 23 Jul 2014 13:05:07 +0000 (13:05 +0000)]
am
5f4ba131: am
59c3da23: Get rid of duplicated code in accessibility settings.
* commit '
5f4ba1315ea6e8936cae63269ab83e6851b78489':
Get rid of duplicated code in accessibility settings.
Narayan Kamath [Wed, 23 Jul 2014 12:51:29 +0000 (12:51 +0000)]
am
59c3da23: Get rid of duplicated code in accessibility settings.
* commit '
59c3da2367bad63efd71753b4d1ad88f2298ddc6':
Get rid of duplicated code in accessibility settings.
Narayan Kamath [Mon, 14 Jul 2014 15:36:10 +0000 (16:36 +0100)]
Get rid of duplicated code in accessibility settings.
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.
bug:
10090157
(cherry picked from commit
26edbccb58c6da452f20ad0695716324e3c29224)
Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
Alan Viverette [Wed, 23 Jul 2014 02:01:21 +0000 (02:01 +0000)]
am
5329be99: am
b125caa7: Merge "Remove dialog icons" into lmp-dev
* commit '
5329be99895530134796cfbbd510ba7fc4457182':
Remove dialog icons
Alan Viverette [Wed, 23 Jul 2014 01:56:41 +0000 (01:56 +0000)]
am
b125caa7: Merge "Remove dialog icons" into lmp-dev
* commit '
b125caa7ed29f1ecf5062452191d061fa890decb':
Remove dialog icons
John Spurlock [Wed, 23 Jul 2014 01:53:15 +0000 (01:53 +0000)]
am
06a7fed9: am
ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
* commit '
06a7fed9c474d44c21074f9884ef637f7c2cf860':
Settings: Disable Interruptions > From when N/A.
John Spurlock [Wed, 23 Jul 2014 01:45:38 +0000 (01:45 +0000)]
am
ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
* commit '
ff941af733a86c4b9fdf1f7f23ac6405faf73231':
Settings: Disable Interruptions > From when N/A.
Dianne Hackborn [Wed, 23 Jul 2014 01:39:46 +0000 (01:39 +0000)]
am
f23885b9: am
b763e342: Improve protection against malicious admins.
* commit '
f23885b92f8b80f55b17fe4072ca8ede9caadcd4':
Improve protection against malicious admins.
Dianne Hackborn [Wed, 23 Jul 2014 01:35:53 +0000 (01:35 +0000)]
am
b763e342: Improve protection against malicious admins.
* commit '
b763e34210e3947b46ef7c9bf396579f17ab0daf':
Improve protection against malicious admins.
Dianne Hackborn [Tue, 22 Jul 2014 23:23:36 +0000 (16:23 -0700)]
Improve protection against malicious admins.
- 2 second timeout until we give up on displaying a message,
keeping us within the 5 second activity launch block time.
- Restart the activity launch block when we show the dialog.
- Use app ops to prevent the app of the currently displayed
admin from putting windows on top while the settings screen
is running.
Change-Id: I631e8896ec7539c2de3ff36f183e67e36bcc37ca
Alan Viverette [Wed, 23 Jul 2014 00:33:20 +0000 (00:33 +0000)]
am
a9653308: am
7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev
* commit '
a9653308e4001150191e0107ceffe7bfd3abf88b':
Reset color space when development options are disabled
Alan Viverette [Wed, 23 Jul 2014 00:27:41 +0000 (00:27 +0000)]
am
7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev
* commit '
7e974f4c8428b889a45e46aa32832e68c5173f3d':
Reset color space when development options are disabled
John Spurlock [Wed, 23 Jul 2014 00:10:18 +0000 (00:10 +0000)]
am
58c891e8: am
54612391: Settings: Tweak zen alarm info string.
* commit '
58c891e8ba5bd927c7f85ebe7abe4dad81f16769':
Settings: Tweak zen alarm info string.
John Spurlock [Tue, 22 Jul 2014 23:57:05 +0000 (23:57 +0000)]
am
54612391: Settings: Tweak zen alarm info string.
* commit '
54612391878a2300fc44ea3f4befc171b3d5e737':
Settings: Tweak zen alarm info string.
John Spurlock [Tue, 22 Jul 2014 20:31:00 +0000 (16:31 -0400)]
Settings: Tweak zen alarm info string.
Use standard styling and remove the bit about timers.
Bug:
16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
Jeff Sharkey [Tue, 22 Jul 2014 23:49:25 +0000 (23:49 +0000)]
am
13948a69: am
e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit '
13948a69f4c68b38ff46f7cc3127ddbfffbf00aa':
Data Usage, materialized!
PauloftheWest [Tue, 22 Jul 2014 23:45:14 +0000 (23:45 +0000)]
am
ca6d88aa: am
0da1f851: Removed WPA PSK from HotSpot Options
* commit '
ca6d88aac96171adab56d51cea9bc315c9966948':
Removed WPA PSK from HotSpot Options
Jeff Sharkey [Tue, 22 Jul 2014 23:44:38 +0000 (23:44 +0000)]
am
e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit '
e65bb4927faf8e353c73b58648e51a8081615dcf':
Data Usage, materialized!
PauloftheWest [Tue, 22 Jul 2014 23:40:20 +0000 (23:40 +0000)]
am
0da1f851: Removed WPA PSK from HotSpot Options
* commit '
0da1f8515a6af368a923cc99e5435795a031692a':
Removed WPA PSK from HotSpot Options
Alan Viverette [Tue, 22 Jul 2014 23:33:44 +0000 (23:33 +0000)]
am
26eaa31c: am
47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '
26eaa31cf100f22050bee0780264a3e6c40c1dac':
Stop using framework-private switch asset
PauloftheWest [Tue, 22 Jul 2014 22:43:59 +0000 (15:43 -0700)]
Removed WPA PSK from HotSpot Options
Bug:
16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
Alan Viverette [Tue, 22 Jul 2014 23:25:38 +0000 (23:25 +0000)]
am
47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '
47d27bd629838ded2d217f238b6e3b21d18485da':
Stop using framework-private switch asset
Fabrice Di Meglio [Tue, 22 Jul 2014 22:24:58 +0000 (22:24 +0000)]
am
4ad8602a: am
3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '
4ad8602ac358672f7f1b162930eccb7e96e223f5':
Add Home / Launcher apps indexing
Fabrice Di Meglio [Tue, 22 Jul 2014 22:20:39 +0000 (22:20 +0000)]
am
3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '
3f3426e0d95aed9ab651a703a3a7e33833cd4741':
Add Home / Launcher apps indexing
Fabrice Di Meglio [Tue, 22 Jul 2014 22:06:31 +0000 (15:06 -0700)]
Add Home / Launcher apps indexing
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too
- also code cleaning for DynamicIndexableContentMonitor
See bug: #
16484927 Add "launcher" as a synonym for "home" in settings search
Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
Alan Viverette [Wed, 23 Jul 2014 01:52:59 +0000 (01:52 +0000)]
Merge "Remove dialog icons" into lmp-dev