Commit Graph

5219 Commits

Author SHA1 Message Date
Paul Lawrence
4ea43465fa am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
* commit '832ad7206299be6db94e82e2387c0fcf8df53e7e':
  Show countdown of remaining decrypt attempts before wiping device
2014-07-24 21:52:43 +00:00
Baligh Uddin
c3bd8097d8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Baligh Uddin
1de9e58b20 Import translations. DO NOT MERGE
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
2014-07-24 21:44:52 +00:00
Paul Lawrence
832ad72062 Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 2014-07-24 20:48:02 +00:00
Adam Lesinski
2c27602438 am 468d3916: Implement the Usage Access Settings UI
* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
  Implement the Usage Access Settings UI
2014-07-24 20:30:37 +00:00
Adam Lesinski
468d39160f Implement the Usage Access Settings UI
Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.

Bug: 16461070

Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9
2014-07-24 13:24:19 -07:00
PauloftheWest
742dd6d406 am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
* commit '28fc05a12bc26c79be697c347dd2930094900744':
  Added SIM Card Activity to Settings
2014-07-24 20:02:57 +00:00
Paul Lawrence
bd4c3210e1 Show countdown of remaining decrypt attempts before wiping device
Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
2014-07-24 08:38:24 -07:00
PauloftheWest
069ed0a678 Merge "Minor character limit fixes for translation." into lmp-dev 2014-07-24 15:37:54 +00:00
PauloftheWest
580362d30b Minor character limit fixes for translation.
Change-Id: I3fdaba305884d961d28c0d22b647b371680e2d52
2014-07-28 11:35:41 -07:00
PauloftheWest
4b26513ff8 Fixed minor character limits for translation.
Change-Id: Ie2d343234a4672f832a9a1d58c790d70d3b47987
2014-07-28 10:34:04 -07:00
PauloftheWest
76c70b0727 Merge "Fixed minor character limits for translation." into lmp-dev 2014-07-24 15:37:54 +00:00
Elliott Hughes
3ded7ddb1f Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 2014-07-24 15:36:21 +00:00
Elliott Hughes
c68ac55e9c Work around an icu4c bug in TimeZoneNames::getDisplayName.
Use America/Buenos_Aires instead of America/Argentina/Buenos_Aires
because the latter doesn't get a localized exemplar location in any
language.

Bug: 16516823
Change-Id: I708288cdc7f8ec7975c8418225abfdca2163ddc5
2014-07-30 11:18:00 -07:00
Fabrice Di Meglio
d5ec63ad51 Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev 2014-07-24 15:36:21 +00:00
Fabrice Di Meglio
58063037f2 Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
- remove this hard coded theme

Change-Id: I003dc2e1d173a3555fab940874ca5ceee0b058d7
2014-07-28 19:32:13 -07:00
Fabrice Di Meglio
a8469d285e Merge "More fixes for QuickLaunchSettings" into lmp-dev 2014-07-24 15:36:21 +00:00
Zoltan Szatmary-Ban
74f34e496f Merge "Update Data Usage Settings for Enterprise" into lmp-dev 2014-07-24 15:36:04 +00:00
Zoltan Szatmary-Ban
0924f199e5 Update Data Usage Settings for Enterprise
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834
Change-Id: I80cdcc062e45e1d2a8077f033562d71217e262bb
2014-07-29 11:10:45 +01:00
Alexandra Gherghina
5ceddfaaf5 Move global sync settings dialogs to the right screen
Bug: 16076571
Change-Id: I4ba01ece6e5054d699342ff2c1270fc2fc51c5a9
2014-07-29 16:19:26 +01:00
Baligh Uddin
d0264a35e4 Merge "Import translations. DO NOT MERGE" 2014-07-24 15:35:58 +00:00
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
PauloftheWest
28fc05a12b Merge "Added SIM Card Activity to Settings" into lmp-dev 2014-07-24 15:35:58 +00: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
PauloftheWest
3815561997 Added SIM Card Activity to Settings
+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS

Bug: 16241745

Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d
2014-07-24 06:41:12 -07:00
Baligh Uddin
f165e120ba Import translations. DO NOT MERGE
Change-Id: Ife340467faf89de06d9f21c3331ad7ccae209635
Auto-generated-cl: translation import
2014-07-24 03:02:05 -07: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
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
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
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
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
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