Commit Graph

5126 Commits

Author SHA1 Message Date
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
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
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
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
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
John Spurlock
a8e0a5b5f9 Merge "Settings: Add to the zen alarm string." into lmp-dev 2014-07-23 18:31:55 +00:00
John Spurlock
1b821ffad4 Settings: Add to the zen alarm string.
Bug:16406214
Change-Id: I9112c93fdee847633f9e5fb79129a3b02af4439e
2014-07-24 11:24:18 -04: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
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
John Spurlock
58c891e8ba am 54612391: Settings: Tweak zen alarm info string.
* commit '54612391878a2300fc44ea3f4befc171b3d5e737':
  Settings: Tweak zen alarm info string.
2014-07-22 23:57:05 +00:00
John Spurlock
5461239187 Settings: Tweak zen alarm info string.
Use standard styling and remove the bit about timers.

Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
2014-07-22 19:51:40 -04:00
Jeff Sharkey
13948a69f4 am e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit 'e65bb4927faf8e353c73b58648e51a8081615dcf':
  Data Usage, materialized!
2014-07-22 23:44:38 +00:00
PauloftheWest
ca6d88aac9 am 0da1f851: Removed WPA PSK from HotSpot Options
* commit '0da1f8515a6af368a923cc99e5435795a031692a':
  Removed WPA PSK from HotSpot Options
2014-07-22 23:40:20 +00:00
PauloftheWest
0da1f8515a Removed WPA PSK from HotSpot Options
Bug: 16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
2014-07-22 23:31:27 +00:00
Alan Viverette
26eaa31cf1 am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '47d27bd629838ded2d217f238b6e3b21d18485da':
  Stop using framework-private switch asset
2014-07-22 23:25:38 +00:00
Fabrice Di Meglio
4ad8602ac3 am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '3f3426e0d95aed9ab651a703a3a7e33833cd4741':
  Add Home / Launcher apps indexing
2014-07-22 22:20:39 +00:00
Fabrice Di Meglio
d73045db7a 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
2014-07-22 15:13:54 -07:00
Alexandra Gherghina
534b84e9f8 am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""
* commit '6d839875b74f1570e8807005c586298beb677413':
  Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:39:17 +00:00
Jeff Sharkey
e65bb4927f Merge "Data Usage, materialized!" into lmp-dev 2014-07-22 20:40:07 +00:00
Jeff Sharkey
b654846300 Data Usage, materialized!
Asset drop so Data Usage matches new Material spec.  Removes time
dimension sweeps, so we now summarize the entire visible axis.  Fix
time axis labels to not draw outside clip bounds.  Remove pie chart.

No more checkboxes in menus.  Telephony items like roaming are moved
back to cellular settings.  Start wiring up multi-SIM support.

Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
2014-07-22 16:24:37 -07:00
Alan Viverette
47d27bd629 Merge "Stop using framework-private switch asset" into lmp-dev 2014-07-22 20:33:22 +00:00
Alan Viverette
09be4b3c87 Stop using framework-private switch asset
BUG: 16467249
Change-Id: I0829c3dea522cf59e0f92046ea7c6092d416ad4c
2014-07-22 16:11:01 -07:00
Alexandra Gherghina
6d839875b7 Revert "Revert "Move global sync settings to AccountSettings.""
This reverts commit 4869faf465.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
2014-07-22 20:25:24 +00:00
John Spurlock
badae7d895 am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
* commit '59ea80b781d8c541076f185cfa81084668521ba5':
  Settings: No really, keep the trailing space.
2014-07-22 19:26:32 +00:00
Fabrice Di Meglio
3f3426e0d9 Merge "Add Home / Launcher apps indexing" into lmp-dev 2014-07-22 16:21:19 +00:00
PauloftheWest
564282a3f4 Merge "Character limit updates" into lmp-dev 2014-07-22 16:13:36 +00:00
PauloftheWest
fb3060378f Character limit updates
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
2014-07-23 10:11:43 -07:00
Adrian Roos
4c177cbd18 am 2c22d6d2: Fix and simplify advanced security settings layout
* commit '2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
  Fix and simplify advanced security settings layout
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
c58595f225 am 4869faf4: Revert "Move global sync settings to AccountSettings."
* commit '4869faf46559c54a34b969b5ae5391a208e723af':
  Revert "Move global sync settings to AccountSettings."
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
761dad7901 am 64fde6f4: Move global sync settings to AccountSettings.
* commit '64fde6f4e9404a363f577a9fda424affcb5138e4':
  Move global sync settings to AccountSettings.
2014-07-22 13:36:38 +00:00
Dianne Hackborn
fb420af379 am ff795ffb: Unify voice interactor and recognizer settings.
* commit 'ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4':
  Unify voice interactor and recognizer settings.
2014-07-22 12:18:00 +00:00
Adrian Roos
2c22d6d204 Fix and simplify advanced security settings layout
Provides correct padding for tablets and sets background
drawable.

Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
2014-07-22 12:08:44 +00:00
Alexandra Gherghina
4869faf465 Revert "Move global sync settings to AccountSettings."
This reverts commit 64fde6f4e9.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9 Move global sync settings to AccountSettings.
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.

Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8 Unify voice interactor and recognizer settings.
There is now one settings UI to select both the new
voice interactor and old voice recognizer.

There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.

Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
2014-07-21 20:14:43 -07:00
Fabrice Di Meglio
794fb56fa4 am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
* commit 'f6f1e2ba1382617cc4df76a004a0da4313a59129':
  Remove fake 8dp padding on N7 devices
2014-07-22 02:21:52 +00:00
Fabrice Di Meglio
f0b952d045 Remove fake 8dp padding on N7 devices
- was a remaining artifact from a test

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ib39166213bb76ceb2319b21cb3651e7c43c4de68
2014-07-21 19:11:06 -07:00
Alan Viverette
84202957f7 am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
* commit 'dd9dcb43778437358847e57c05c6926e42e47c62':
  Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:12:40 +00:00