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

14813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tadashi G. Takaoka
72f7072328 Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev 2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
9a8b4f239f Preserve enabled subtypes across disabling and re-enabling an IME 
Bug: 16464156
Change-Id: I2ea4d010e47e5f48b2df11775b0c262330b28e89
 2014-07-28 11:40:22 +09:00
Tadashi G. Takaoka
935f97cd9b Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev 2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
1671fbbc9d Show "up navigate" icon in input method subtype enabler 
Since API 16 (and API 14 with support library) and later, we started
supporting "up navigation" model.
http://developer.android.com/training/implementing-navigation/ancestral.html

As a part of Settings app and a part of an IME's settings activity,
the input method subtype enabler should have a "up navigate icon on
its action bar.

Bug: 16595009
Change-Id: Iaaadd970395b9c9254ab60b2e8fee22dffb8c7f6
 2014-07-27 14:26:57 +09: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
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
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
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
Fabrice Di Meglio
a6dbeae65f Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev 2014-07-24 15:36:02 +00: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
Alexandra Gherghina
4a45be2ff8 Merge "Move global sync settings dialogs to the right screen" into lmp-dev 2014-07-24 15:35:58 +00: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
Zoltan Szatmary-Ban
0598e6f684 Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev 2014-07-24 15:35:58 +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
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