Alexandra Gherghina
6b68dba3b0
am 214712dd
: am 2513851a
: Adds cross-profile intents for Settings screens.
...
* commit '214712dda0a9ecea1af609b0e1029cbf627e73aa':
Adds cross-profile intents for Settings screens.
2014-07-24 23:30:49 +00:00
Alexandra Gherghina
26e2f3acff
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
2014-07-24 23:30:48 +00:00
Fabrice Di Meglio
459baaa9f5
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
2014-07-24 19:48:10 +00:00
Fabrice Di Meglio
24d06e1da4
am d2f47cc2
: am 87915ea0
: Merge "Code cleaning" into lmp-dev
...
* commit 'd2f47cc243ae64568f737023e450b03a40ea72c5':
Code cleaning
2014-07-24 19:47:58 +00:00
Fabrice Di Meglio
0a1732f961
am e0c5dd07
: am 456229cc
: Merge "Fix how Home Activities are refreshed" into lmp-dev
...
* commit 'e0c5dd07979b57940264f1b72957bd84ecb88740':
Fix how Home Activities are refreshed
2014-07-24 19:47:30 +00:00
Fabrice Di Meglio
482bcaf107
am b90ce51c
: am 1e9405b5
: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev
...
* commit 'b90ce51c3dd222cc761d5bd01ffff2039b976224':
Add Settings Dashboard refresh for Home activities
2014-07-24 19:46:30 +00:00
Jim Miller
ab2b852cee
am 18be821a
: am dfd2c6f2
: Change wording in keyguard settings menu.
...
* commit '18be821acacd14cd7e8425c53095e8a2f4bd2b69':
Change wording in keyguard settings menu.
2014-07-24 19:46:26 +00:00
Maurice Lam
66336045c4
am 7fbde725
: am 56d781b3
: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
...
* commit '7fbde72593b42d452ac492c00845b097efa8f0b4':
[WifiSetup] Tablet landscape layout
2014-07-24 19:46:24 +00:00
Fabrice Di Meglio
3e55211042
am fd45a5c6
: am 56fc6a75
: Merge "Code cleaning for Index" into lmp-dev
...
* commit 'fd45a5c6352d734b7cf27e8da6e6f133f364612c':
Code cleaning for Index
2014-07-24 19:46:08 +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
dc5db975aa
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
2014-07-23 22:00:48 +00:00
Alan Viverette
7444eb5475
am 8f866a5a
: am 68419fca
: Merge "Use activity for brightness dialog" into lmp-dev
...
* commit '8f866a5a941bf2e6db587bfbc826fa3b3fccc748':
Use activity for brightness dialog
2014-07-23 21:55:52 +00:00
Dianne Hackborn
1c286fbdae
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
2014-07-23 21:55:39 +00:00
Julia Reynolds
6bcd506f22
am e4e607a3
: am 1a0297c5
: Use restrictionsprovider framework in Settings.
...
* commit 'e4e607a3832a4894419c96726361a752a435fe70':
Use restrictionsprovider framework in Settings.
2014-07-23 21:55:33 +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
f8af2566f2
am 5f71155c
: am 289a63f5
: Merge "Fix NotificationStation theming" into lmp-dev
...
* commit '5f71155cbc4e677a7bac07296154deef89592e22':
Fix NotificationStation theming
2014-07-23 20:45:14 +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
8fc6c00652
am 2f2a23de
: am a79400de
: Merge "Code cleaning for NotificationStation" into lmp-dev
...
* commit '2f2a23dee368e04995211994defd72eb8f406a3c':
Code cleaning for NotificationStation
2014-07-23 20:24:13 +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
d2bc6f453c
am c95775b5
: am 6cad2550
: Merge "OwnerInfos code cleaning" into lmp-dev
...
* commit 'c95775b543366e36e652c7d5f04e5b21121053f9':
OwnerInfos code cleaning
2014-07-23 20:01:25 +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
2daea07767
am 5c399368
: am d39d7314
: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit '5c3993682ab792d7a98792d30181a32e8cb96548':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:28:01 +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