PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,574 Commits 1 Branch 0 Tags
c5a80a987d5f5d5b8efa2e51179f45c272a738de
Commit Graph

14574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
c5a80a987d am 2d578ce2: Don\'t use the profile info for name 
* commit '2d578ce29391dc72fde7330ff9ff909347ec531b':
  Don't use the profile info for name
 2014-07-25 16:46:48 +00:00
Amith Yamasani
2d578ce293 Don't use the profile info for name 
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.

Bug: 15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
 2014-07-25 09:37:33 -07:00
Fabrice Di Meglio
48aad31457 am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev 
* commit '8610ff9ea678201920bf6fb7d3a2b141226f6640':
  Fix Preferences background color
 2014-07-25 03:03:43 +00:00
Fabrice Di Meglio
a757b61ec9 am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev 
* commit 'a8469d285e1956e2a90a4475ad6e5981dee34223':
  More fixes for QuickLaunchSettings
 2014-07-24 23:23:55 +00:00
Amith Yamasani
156d182780 am ee398747: Refactor User Profile editor dialog for reuse 
* commit 'ee3987475e1d29e8355bdb9e068149eb01e3fd43':
  Refactor User Profile editor dialog for reuse
 2014-07-24 23:23:54 +00:00
Amith Yamasani
ee3987475e Refactor User Profile editor dialog for reuse 
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.

Bug: 15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
 2014-07-24 23:13:34 +00:00
rich cannings
0ed8633fed am b8684d57: Remove "Verify apps" from Security settings 
* commit 'b8684d573e1357ee573f26d511a630b39e368d0f':
  Remove "Verify apps" from Security settings
 2014-07-24 22:47:13 +00:00
rich cannings
b8684d573e Remove "Verify apps" from Security settings 
The setting moved to Google settings

Bug: 15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
 2014-07-24 15:13:23 -07:00
Fabrice Di Meglio
8610ff9ea6 Merge "Fix Preferences background color" into lmp-dev 2014-07-24 22:06:48 +00:00
Fabrice Di Meglio
1bf89b742d Fix Preferences background color 
- use #FFFAFAFA instead of pure white

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

Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
 2014-07-24 17:03:04 -07:00
Fabrice Di Meglio
e20e169bbe More fixes for QuickLaunchSettings 
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme

Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
 2014-07-24 15:46:35 -07:00
Baligh Uddin
c8f4e83de2 am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
  Import translations. DO NOT MERGE
 2014-07-24 21:52:43 +00:00
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
Fabrice Di Meglio
997e93cca4 am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 
* commit '6cef9d23b8572d8bd87329999f10286e29a861c0':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
 2014-07-24 21:26:47 +00:00
Fabrice Di Meglio
e3ff4d8e92 Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS 
- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
 2014-07-24 14:07:02 -07: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
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
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
Fabrice Di Meglio
a8469d285e Merge "More fixes for QuickLaunchSettings" into lmp-dev 2014-07-24 15:36:21 +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
Fabrice Di Meglio
6cef9d23b8 Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 2014-07-24 15:36:02 +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
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