Commit Graph

14548 Commits

Author SHA1 Message Date
PauloftheWest
ff455f40b6 am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
* commit '958d1ee6d584b7489d57071305c44635a0534ba9':
  Fixed an illustrious NullPointer bug on Wifi Assistant
2014-07-24 18:51:10 +00:00
PauloftheWest
958d1ee6d5 Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 2014-07-24 15:36:14 +00:00
PauloftheWest
63a1affdae Fixed an illustrious NullPointer bug on Wifi Assistant
+ The class was never instantiated...

Bug: 16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b
2014-07-24 11:45:22 -07:00
John Spurlock
384ad06ec0 am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
* commit 'a8e0a5b5f9a1d9fbade91909d57eb431fed69a86':
  Settings: Add to the zen alarm string.
2014-07-24 15:31:02 +00:00
Paul Lawrence
741bad53a0 am e68f5224: Show correct string when prompting for pattern before encrypting
* commit 'e68f5224e4359aef7f62c94130d5b9b221bee389':
  Show correct string when prompting for pattern before encrypting
2014-07-24 15:15:09 +00:00
Paul Lawrence
e68f5224e4 Show correct string when prompting for pattern before encrypting
Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
2014-07-24 15:11:16 +00:00
Alexandra Gherghina
214712dda0 am 2513851a: Adds cross-profile intents for Settings screens.
* commit '2513851ace8d353f99146316b81a430add6d837f':
  Adds cross-profile intents for Settings screens.
2014-07-24 12:51:08 +00:00
Alexandra Gherghina
2513851ace 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
2014-07-24 13:45:52 +01:00
Alexandra Gherghina
2a459d3008 am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev
* commit '377b8df3ed89f2e61b6755aee8136754a2edf9c5':
  Checks if the right user has a restriction
2014-07-24 12:27:14 +00:00
Fabrice Di Meglio
e2953d9f5f am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev
* commit '76f5c3bc722b7450870c586bffef1688e96607b7':
  More code cleaning for the Home intent filters
2014-07-24 02:41:04 +00:00
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
Alexandra Gherghina
377b8df3ed Merge "Checks if the right user has a restriction" into lmp-dev 2014-07-23 19:22:09 +00:00
Alexandra Gherghina
e82d0f2f8e Checks if the right user has a restriction
Bug: 15466880
Change-Id: I9199c6054e9955a90958fd3a751f321cf6fa9990
2014-07-23 22:09:07 +01: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
Fabrice Di Meglio
76f5c3bc72 Merge "More code cleaning for the Home intent filters" into lmp-dev 2014-07-23 18:44:51 +00:00
Fabrice Di Meglio
c9ad22c38b 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
2014-07-23 19:32:57 -07: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