Fabrice Di Meglio
d2f47cc243
am 87915ea0
: Merge "Code cleaning" into lmp-dev
...
* commit '87915ea074c62b591a2f9967c57ab21412c6cae8':
Code cleaning
2014-07-24 02:10:29 +00:00
Fabrice Di Meglio
e0c5dd0797
am 456229cc
: Merge "Fix how Home Activities are refreshed" into lmp-dev
...
* commit '456229ccdfb6ddb8cd1ac3be939e1c2221f4bedd':
Fix how Home Activities are refreshed
2014-07-24 01:31:21 +00:00
Fabrice Di Meglio
b90ce51c3d
am 1e9405b5
: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
...
* commit '1e9405b5cc35d598507fccdfa0e833ab83b2cfd9':
Add Settings Dashboard refresh for Home activities
2014-07-23 23:35:57 +00:00
Jim Miller
18be821aca
am dfd2c6f2
: Change wording in keyguard settings menu.
...
* commit 'dfd2c6f261df4d5de5111524bd6205406d0e72db':
Change wording in keyguard settings menu.
2014-07-23 23:23:58 +00:00
Jim Miller
dfd2c6f261
Change wording in keyguard settings menu.
...
Fixes bug 15167729
Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
2014-07-23 23:20:33 +00:00
Maurice Lam
7fbde72593
am 56d781b3
: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
...
* commit '56d781b32b7aad0fb0bb41aae26ce896f1fedfdc':
[WifiSetup] Tablet landscape layout
2014-07-23 23:03:29 +00:00
Fabrice Di Meglio
fd45a5c635
am 56fc6a75
: Merge "Code cleaning for Index" into lmp-dev
...
* commit '56fc6a75302c8525e45d6898901f45b0de526944':
Code cleaning for Index
2014-07-23 22:44:41 +00:00
PauloftheWest
ac1dedafa1
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
2014-07-23 21:55:25 +00:00
Alan Viverette
8f866a5a94
am 68419fca
: Merge "Use activity for brightness dialog" into lmp-dev
...
* commit '68419fca2d03b8c5afd9f5dfecef8a4415ff063d':
Use activity for brightness dialog
2014-07-23 21:47:04 +00:00
Dianne Hackborn
cc20a5b1fe
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
2014-07-23 21:43:17 +00:00
Julia Reynolds
e4e607a383
am 1a0297c5
: Use restrictionsprovider framework in Settings.
...
* commit '1a0297c544cb15ed4b56e70575b169b3889543b7':
Use restrictionsprovider framework in Settings.
2014-07-23 21:22:51 +00:00
Julia Reynolds
1a0297c544
Use restrictionsprovider framework in Settings.
...
Bug: 15305103
Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
2014-07-23 21:06:21 +00:00
Fabrice Di Meglio
5f71155cbc
am 289a63f5
: Merge "Fix NotificationStation theming" into lmp-dev
...
* commit '289a63f509972372e37fc95de630a5410b4ebd5c':
Fix NotificationStation theming
2014-07-23 20:41:33 +00:00
Fabrice Di Meglio
2f2a23dee3
am a79400de
: Merge "Code cleaning for NotificationStation" into lmp-dev
...
* commit 'a79400defc90a65437589cd5ede8de291692c75f':
Code cleaning for NotificationStation
2014-07-23 20:19:36 +00:00
Fabrice Di Meglio
c95775b543
am 6cad2550
: Merge "OwnerInfos code cleaning" into lmp-dev
...
* commit '6cad255000e2bff5475e0816d18e4b0b68481283':
OwnerInfos code cleaning
2014-07-23 19:56:46 +00:00
John Spurlock
5c3993682a
am d39d7314
: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit 'd39d731473efbc84ec5640d89d0f275c759b3402':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:23:46 +00:00
Maurice Lam
56d781b32b
Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
2014-07-23 18:56:15 +00:00
Maurice Lam
068354a1bb
[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
2014-07-23 14:10:46 -07:00
Fabrice Di Meglio
56fc6a7530
Merge "Code cleaning for Index" into lmp-dev
2014-07-23 18:56:15 +00:00
Fabrice Di Meglio
9301441e2a
Code cleaning for Index
...
- make that UpdateData class static
Change-Id: I22ac148613fcaa4ed3ad615c4eca037b5dc6b986
2014-07-23 15:35:33 -07:00
Fabrice Di Meglio
9c3f11fa05
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
2014-07-23 13:31:26 -07:00
Fabrice Di Meglio
6e10693db5
Code cleaning for NotificationStation
...
- remove dead code and vars
- log exceptions
Change-Id: Idff91c27620955a3458c2358b629331e140aedba
2014-07-23 13:07:52 -07:00
Fabrice Di Meglio
0592a21fd8
OwnerInfos code cleaning
...
Change-Id: I5f4e5dcee4af672fa11f552544bfcf4506a21258
2014-07-23 12:45:13 -07:00
Fabrice Di Meglio
87915ea074
Merge "Code cleaning" into lmp-dev
2014-07-23 18:50:38 +00:00
Fabrice Di Meglio
7f5c5e8bb8
Code cleaning
...
- remove those non usefull Intent.CATEGORY_LAUNCHER
Change-Id: Ib6e5f4a5265633da85423307fac26a104814f05f
2014-07-23 19:03:33 -07:00
Fabrice Di Meglio
b0a464fd2c
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
2014-07-23 18:20:53 -07:00
Fabrice Di Meglio
ceb335f88f
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
2014-07-23 16:25:30 -07:00
Fabrice Di Meglio
456229ccdf
Merge "Fix how Home Activities are refreshed" into lmp-dev
2014-07-23 18:50:38 +00:00
Fabrice Di Meglio
1e9405b5cc
Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
2014-07-23 18:50:38 +00:00
PauloftheWest
d89febb6de
Merge "Fixed bug where multiple access points would show connected" into lmp-dev
2014-07-23 18:44:51 +00:00
PauloftheWest
85f545b5d9
Fixed bug where multiple access points would show connected
...
Bug: 16236217
Change-Id: I0d95c753025f0787ca03876bab1fb66ec7916bf7
2014-07-23 14:50:57 -07:00
Alan Viverette
68419fca2d
Merge "Use activity for brightness dialog" into lmp-dev
2014-07-23 18:44:51 +00:00
Dianne Hackborn
f151ea3482
Merge "Work on issue #16135174 : Apps page "smoke" gradient footer must be removed" into lmp-dev
2014-07-23 18:44:51 +00:00
Dianne Hackborn
fe9590bb19
Work on issue #16135174 : Apps page "smoke" gradient footer must be removed
...
New header in running services. Not yet done.
Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e
2014-07-23 13:50:07 -07:00
Fabrice Di Meglio
289a63f509
Merge "Fix NotificationStation theming" into lmp-dev
2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
a79400defc
Merge "Code cleaning for NotificationStation" into lmp-dev
2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
6cad255000
Merge "OwnerInfos code cleaning" into lmp-dev
2014-07-23 18:44:51 +00:00
John Spurlock
d39d731473
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
2014-07-23 18:31:55 +00:00
PauloftheWest
b6e74d867c
am 564282a3
: Merge "Character limit updates" into lmp-dev
...
* commit '564282a3f4645cf50aedd3cc809debe4f77a586b':
Character limit updates
2014-07-23 17:19:43 +00:00
John Spurlock
333efe9097
Settings: Wire up Display > Lift to wake.
...
Bug:15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
2014-07-23 13:12:50 -04:00
Julia Reynolds
5a9e9a2ebd
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.
2014-07-23 14:54:04 +00:00
Paul Lawrence
ff3f9cf279
am 7ae20e3c
: Allow CryptKeeper dialogs to rotate on tablets
...
* commit '7ae20e3ce98543888cfccbef6b1254d060bc30ca':
Allow CryptKeeper dialogs to rotate on tablets
2014-07-23 14:43:36 +00:00
Paul Lawrence
7ae20e3ce9
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
2014-07-23 14:39:31 +00:00
Narayan Kamath
5f4ba1315e
am 59c3da23
: Get rid of duplicated code in accessibility settings.
...
* commit '59c3da2367bad63efd71753b4d1ad88f2298ddc6':
Get rid of duplicated code in accessibility settings.
2014-07-23 12:51:29 +00:00
Narayan Kamath
59c3da2367
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 26edbccb58
)
Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
2014-07-23 11:10:16 +01:00
Alan Viverette
5329be9989
am b125caa7
: Merge "Remove dialog icons" into lmp-dev
...
* commit 'b125caa7ed29f1ecf5062452191d061fa890decb':
Remove dialog icons
2014-07-23 01:56:41 +00:00
John Spurlock
06a7fed9c4
am ff941af7
: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
...
* commit 'ff941af733a86c4b9fdf1f7f23ac6405faf73231':
Settings: Disable Interruptions > From when N/A.
2014-07-23 01:45:38 +00:00
Dianne Hackborn
f23885b92f
am b763e342
: Improve protection against malicious admins.
...
* commit 'b763e34210e3947b46ef7c9bf396579f17ab0daf':
Improve protection against malicious admins.
2014-07-23 01:35:53 +00:00
Dianne Hackborn
b763e34210
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
2014-07-22 18:30:26 -07:00
Alan Viverette
a9653308e4
am 7e974f4c
: Merge "Reset color space when development options are disabled" into lmp-dev
...
* commit '7e974f4c8428b889a45e46aa32832e68c5173f3d':
Reset color space when development options are disabled
2014-07-23 00:27:41 +00:00