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

14441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ffaa5a31a1 am 633b30ad: am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 
* commit '633b30ad3fc0e737eeed80511f8015d7c1d6f365':
  Remove deprecated locales - DO NOT MERGE
 2014-07-20 18:08:24 +00:00
Tadashi G. Takaoka
ddd69ec466 am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev 
* commit '05f5734cc52b9eed8880d95d395ae82e2856e0c3':
  Fix Settings behavior when disabling current IME
 2014-07-20 18:07:56 +00:00
Baligh Uddin
56a280becf am ff6c12df: (-s ours) am fdac5db8: (-s ours) Import translations. DO NOT MERGE 
* commit 'ff6c12df927a42b33730f770e1e4fd26225f7245':
  Import translations. DO NOT MERGE
 2014-07-20 18:06:50 +00:00
Tadashi G. Takaoka
a1fa80662c am ecf1b79f: am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev 
* commit 'ecf1b79f1622c526fb4dd86ed4f10fd8237a724e':
  Remove unnecessary saved persistent preference
 2014-07-20 18:04:19 +00:00
Fabrice Di Meglio
8cd29142cc am 7ca153f1: am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev 
* commit '7ca153f11704f8c16195a4e03de81140c1ca0088':
  Fix Utils.prepareCustomPreferencesList()
 2014-07-20 18:03:03 +00:00
Fabrice Di Meglio
a4eebd87d2 am 595b61eb: am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev 
* commit '595b61eb3921fead66fc163d33d835e5ba378e7f':
  Fix the way we select and apply Themes
 2014-07-20 18:01:52 +00:00
Fabrice Di Meglio
182898133b am ce0e3008: am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev 
* commit 'ce0e3008e8e6726e51195f01591666dc7bebf7f3':
  Fix overdraw and do some layout optimizations
 2014-07-20 17:59:33 +00:00
Baligh Uddin
633b30ad3f am 0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 
* commit '0f364cdf63c7405ba30d814f30f6fa1fdfd65ee7':
  Remove deprecated locales - DO NOT MERGE
 2014-07-20 02:39:53 +00:00
Adam Lesinski
3a2a4720c1 am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API 
* commit '3becea17e7f9bc15005e013787392d0a11ea8b73':
  Update Settings to use new UsageStats API
 2014-07-20 02:17:44 +00:00
Tadashi G. Takaoka
05f5734cc5 am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev 
* commit 'a229125980f12c9debb1c5a827bb96c5620b5705':
  Fix Settings behavior when disabling current IME
 2014-07-20 01:04:33 +00:00
Tadashi G. Takaoka
a229125980 Merge "Fix Settings behavior when disabling current IME" into lmp-dev 2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka
a82c3824f3 Fix Settings behavior when disabling current IME 
Bug: 16195373
Change-Id: I95d086e152b07e81aece773bc115ac0ac4517392
 2014-07-19 17:29:28 -07:00
Baligh Uddin
ff6c12df92 am fdac5db8: (-s ours) Import translations. DO NOT MERGE 
* commit 'fdac5db893285b421c9631dbc62b41a46985aa34':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:02 +00:00
Baligh Uddin
fdac5db893 Import translations. DO NOT MERGE 
Change-Id: If479170defb29f3874fa320e15acd587560cff4c
Auto-generated-cl: translation import
 2014-07-19 21:43:32 +00:00
Tadashi G. Takaoka
ecf1b79f16 am 721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev 
* commit '721e63fc6da5685a22848c297676dfb5ec959367':
  Remove unnecessary saved persistent preference
 2014-07-19 19:13:12 +00:00
Fabrice Di Meglio
7ca153f117 am 6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev 
* commit '6f404853087796d46f7a7ef1ad986ec351cc720c':
  Fix Utils.prepareCustomPreferencesList()
 2014-07-19 02:23:26 +00:00
Fabrice Di Meglio
595b61eb39 am 39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev 
* commit '39a2cbb32cd93d7eb61a82f395a202238c10e76c':
  Fix the way we select and apply Themes
 2014-07-19 00:59:02 +00:00
Fabrice Di Meglio
ce0e3008e8 am 84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev 
* commit '84dfc0b5d64f9a7224e524794783080fc1b0419e':
  Fix overdraw and do some layout optimizations
 2014-07-19 00:06:37 +00:00
Adam Lesinski
3becea17e7 am 8d7be7b7: Update Settings to use new UsageStats API 
* commit '8d7be7b738cce9facdd8832aa845ceb79c19ffc6':
  Update Settings to use new UsageStats API
 2014-07-18 22:29:04 +00:00
Jeff Davidson
d1c3840ede am 2622bd75: am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev 
* commit '2622bd759967810b06608682a664fa4478bd8fd2':
  Link WifiAssistant card with actual settings.
 2014-07-18 22:09:14 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API 
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
 2014-07-18 14:35:54 -07:00
Jeff Davidson
2622bd7599 am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev 
* commit '878ca0edb9598de695750b72c7cd3d1c056d984c':
  Link WifiAssistant card with actual settings.
 2014-07-18 20:59:42 +00:00
Paul Lawrence
17b1690d5f am bf052423: am 312927ab: Material fixes for tablets 
* commit 'bf0524230034d0569348ac5c74d3a1f1912f4b42':
  Material fixes for tablets
 2014-07-18 19:58:58 +00:00
Paul Lawrence
bf05242300 am 312927ab: Material fixes for tablets 
* commit '312927abd77b0884eed9aa2ca1de4d0c04b4165f':
  Material fixes for tablets
 2014-07-18 19:54:06 +00:00
Paul Lawrence
312927abd7 Material fixes for tablets 
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.

Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
 2014-07-18 19:49:26 +00:00
Maurice Lam
836e70f406 am a4980833: am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 
* commit 'a498083303e08353574b551e4a236eb5251297b6':
  [WifiSetup] Mechanism for suspending auto finish
 2014-07-18 19:18:48 +00:00
Maurice Lam
a498083303 am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 
* commit 'b3f69cd10435fdf2d799bafdde4949e70c1f84f1':
  [WifiSetup] Mechanism for suspending auto finish
 2014-07-18 19:12:41 +00:00
PauloftheWest
e25fcbf1f4 am 72e4a85b: am 772cf206: Merge "Minor string fixes for translation" into lmp-dev 
* commit '72e4a85b5a5554a6eab42df92bf8e4294408ba3c':
  Minor string fixes for translation
 2014-07-18 18:59:45 +00:00
Fabrice Di Meglio
39a2cbb32c Merge "Fix the way we select and apply Themes" into lmp-dev 2014-07-18 18:24:25 +00:00
Fabrice Di Meglio
712df6cb70 Fix the way we select and apply Themes 
- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar

Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
 2014-07-18 17:44:37 -07:00
Fabrice Di Meglio
d40dd45c18 Fix overdraw and do some layout optimizations 
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences

The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"

Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
 2014-07-18 16:33:32 -07:00
Fabrice Di Meglio
84dfc0b5d6 Merge "Fix overdraw and do some layout optimizations" into lmp-dev 2014-07-18 18:24:25 +00:00
PauloftheWest
72e4a85b5a am 772cf206: Merge "Minor string fixes for translation" into lmp-dev 
* commit '772cf2061685e5c7df4b1ebedd1249243cde6f74':
  Minor string fixes for translation
 2014-07-18 18:12:45 +00:00
Andres Morales
7d6a6ebc81 am 5b452a11: am 7ab8929c: On factory reset, wipe the stored account challenges 
* commit '5b452a11631338a12fc3ee09ca091c900fd7a8ba':
  On factory reset, wipe the stored account challenges
 2014-07-18 16:52:06 +00:00
Andres Morales
5b452a1163 am 7ab8929c: On factory reset, wipe the stored account challenges 
* commit '7ab8929cc6ecbd1ba14c0d6ecb393b31f9a6fcda':
  On factory reset, wipe the stored account challenges
 2014-07-18 16:46:20 +00:00
Andres Morales
7ab8929cc6 On factory reset, wipe the stored account challenges 
Each time a user adds an account, a challenge gets
stored to the persistent data block service.

If a user factory resets *from Settings*, this is
considered a "secure wipe" and thus we must wipe
the account challenges as well.

No other factory reset mechanism must be permitted
to wipe this data.

Bug: 14288780
Change-Id: Ibe48ccae2d7b5f8d736717a27b7c4f44bed0fba7
 2014-07-18 16:40:37 +00:00
Amith Yamasani
0e62c43d72 am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev 
* commit '66926227ebabd856f872d12c22a11ffd748c48b0':
  Improvements to user settings
 2014-07-18 15:06:05 +00:00
Amith Yamasani
66926227eb am d0a057cc: Merge "Improvements to user settings" into lmp-dev 
* commit 'd0a057ccc89f65f0971a2e7c42758b0fedf7c501':
  Improvements to user settings
 2014-07-18 15:02:03 +00:00
Alexandra Gherghina
ec2786a9b5 am 527f0d20: am 89265a30: Hide Settings launcher icon for a managed profile 
* commit '527f0d2066dd976cf93485262c54c8e3f9ad4768':
  Hide Settings launcher icon for a managed profile
 2014-07-18 11:45:43 +00:00
Alexandra Gherghina
17c9d3c92c am a41da78e: am ccdc369e: Merge "Add account for managed user" into lmp-dev 
* commit 'a41da78efb6021bdf72809f2eae0ff86d2859f3e':
  Add account for managed user
 2014-07-18 11:45:42 +00:00
Alexandra Gherghina
527f0d2066 am 89265a30: Hide Settings launcher icon for a managed profile 
* commit '89265a3026faad35107d6ef08f9a59f680819aaf':
  Hide Settings launcher icon for a managed profile
 2014-07-18 11:22:36 +00:00
Alexandra Gherghina
a41da78efb am ccdc369e: Merge "Add account for managed user" into lmp-dev 
* commit 'ccdc369e4772ed3d97508938861ee00457f8ba3e':
  Add account for managed user
 2014-07-18 11:22:35 +00:00
Alexandra Gherghina
89265a3026 Hide Settings launcher icon for a managed profile 
This makes the Settings icon disappear at the next reboot.

Bug: 16369104
Change-Id: Ic0a394413a0f2dc573d340394d2cd24388535856
 2014-07-18 11:39:29 +01:00
Fabrice Di Meglio
f54cdcdd36 am c63f16ce: am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 
* commit 'c63f16ce0d78982d8372836cd3efea05f13e6fb6':
  Fix alignment of ActionBar title and Preferences for tablet UI
 2014-07-18 03:09:58 +00:00
Tadashi G. Takaoka
02d8341ca4 am 740de4d3: am 3ac7802e: Fix duplicate string resources 
* commit '740de4d39c95a4e9613bd744da9ec0ecafab7124':
  Fix duplicate string resources
 2014-07-18 03:09:37 +00:00
Fabrice Di Meglio
c63f16ce0d am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
  Fix alignment of ActionBar title and Preferences for tablet UI
 2014-07-18 02:43:49 +00:00
Fabrice Di Meglio
3bd0515242 Fix alignment of ActionBar title and Preferences for tablet UI 
- use the correct start/end padding

See bug: #15439371 Visual add white BG for Settings Detail

Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
 2014-07-17 19:36:14 -07:00
Tadashi G. Takaoka
740de4d39c am 3ac7802e: Fix duplicate string resources 
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
  Fix duplicate string resources
 2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources 
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
 2014-07-17 18:07:26 -07:00
Michael Wright
9292e27026 am 87b69c30: am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 
* commit '87b69c303063321e871028ff713c26e200d32cc4':
  Add OP_PROJECT_MEDIA to AppOps
 2014-07-18 00:32:08 +00:00