Jim Miller
5d12af524f
am ab2b852c: am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu.
...
* commit 'ab2b852cee8a178097b34d42d5482fecd638414f':
Change wording in keyguard settings menu.
2014-07-24 19:59:52 +00:00
Maurice Lam
4548c34ece
am 66336045: am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
...
* commit '66336045c461a1ce32855b50a150b91bd2c569cc':
[WifiSetup] Tablet landscape layout
2014-07-24 19:59:51 +00:00
Fabrice Di Meglio
4be6250bee
am 3e552110: am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev
...
* commit '3e552110423393020d589998bf21696f3924585a':
Code cleaning for Index
2014-07-24 19:59:50 +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
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
9c982871c7
am dc5db975: am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev
...
* commit 'dc5db975aaae95ec4e27d48b7748364692afa2b9':
Fixed bug where multiple access points would show connected
2014-07-23 22:04:54 +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
71a0924e24
am 7444eb54: am 8f866a5a: am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev
...
* commit '7444eb5475b94ac7205c0845b172f4c5b6da4880':
Use activity for brightness dialog
2014-07-23 22:00:15 +00:00
Dianne Hackborn
d2b634110d
am 1c286fbd: am cc20a5b1: am f151ea34: Merge "Work on issue #16135174 : Apps page "smoke" gradient footer must be removed" into lmp-dev
...
* commit '1c286fbdae93ab09edd7493c72c7d8c42d5ce678':
Work on issue #16135174 : Apps page "smoke" gradient footer must be removed
2014-07-23 22:00:14 +00:00
Julia Reynolds
23e921850b
am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings.
...
* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
Use restrictionsprovider framework in Settings.
2014-07-23 22:00:13 +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
12dfa2ed18
am f8af2566: am 5f71155c: am 289a63f5: Merge "Fix NotificationStation theming" into lmp-dev
...
* commit 'f8af2566f22033c057b21befffc1e9801b502bb1':
Fix NotificationStation theming
2014-07-23 20:47:53 +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
d9ca152d37
am 8fc6c006: am 2f2a23de: am a79400de: Merge "Code cleaning for NotificationStation" into lmp-dev
...
* commit '8fc6c006522138dca6dc72d11b2b9a51ef4ded5e':
Code cleaning for NotificationStation
2014-07-23 20:28:15 +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
d59d8d3b5e
am d2bc6f45: am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev
...
* commit 'd2bc6f453c6f923ddb1ac0c0d9afee9a27de8b32':
OwnerInfos code cleaning
2014-07-23 20:05:48 +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
c3fc2cbf38
am 2daea077: am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit '2daea077674caffd34d2022cd4cd37516d919f8c':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:36:14 +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
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
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