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

14616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Lawrence
951b69ee65 am 2126ac9f: am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev 
* commit '2126ac9fa117bd21be947ba3af182169798d8d00':
  Final touches to material theme for phones
 2014-07-17 23:48:05 +00:00
Michael Wright
87b69c3030 am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
  Add OP_PROJECT_MEDIA to AppOps
 2014-07-17 22:03:58 +00:00
Tadashi G. Takaoka
721e63fc6d Merge "Remove unnecessary saved persistent preference" into lmp-dev 2014-07-17 21:58:28 +00:00
Tadashi G. Takaoka
3460a2683c Remove unnecessary saved persistent preference 
This CL also fixes a bug in
InputMethodAndSubtypeUtil.updateSubtypesPreferenceChecked method that
prevents solving the issue/16115751.

Bug: 16115751
Change-Id: Ib46790172ed539d444fd609a1a97dabb2cb2d2f3
 2014-07-18 18:21:44 -07:00
Maurice Lam
b3f69cd104 Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 2014-07-17 21:58:28 +00:00
Maurice Lam
6a627652cb [WifiSetup] Mechanism for suspending auto finish 
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.

The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.

The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.

Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.

Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
 2014-07-17 20:47:04 -07:00
PauloftheWest
772cf20616 Merge "Minor string fixes for translation" into lmp-dev 2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a Minor string fixes for translation 
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
 2014-07-18 11:04:13 -07:00
Fabrice Di Meglio
c08c67be88 Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 2014-07-17 21:58:28 +00:00
Zoltan Szatmary-Ban
dc2620425d am ef8a48c8: am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev 
* commit 'ef8a48c85b8c9ff31e731c82f83bf183e4a8994b':
  Update Location Settings for Enterprise
 2014-07-17 21:29:47 +00:00
Chris Craik
7c6c12f885 am 4ce86a69: am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev 
* commit '4ce86a69a8b2c5d89b7e67c9aa08eda03961efb7':
  Access high contrast setting directly
 2014-07-17 21:29:38 +00:00
Alexandra Gherghina
692b03c49e am 46ad8100: am c42d4059: Remove account for a managed user 
* commit '46ad8100475c8bb2c5aa3ee7787674ef0669c634':
  Remove account for a managed user
 2014-07-17 21:29:33 +00:00
PauloftheWest
e4a04c83f5 am 995448c7: am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit '995448c76a6b10782c05b968d3e8b656552c06e1':
  Removed extraneous string from strings.xml
 2014-07-17 21:29:25 +00:00
Alexandra Gherghina
85d6818cf2 am 84d71954: am 7c81c1d1: Handle managing accounts for a managed profile 
* commit '84d719542d430bd3e0074925629ae3d51fd561f9':
  Handle managing accounts for a managed profile
 2014-07-17 21:29:23 +00:00
Paul Lawrence
2126ac9fa1 am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev 
* commit 'eb0628bb02e5945acc0b5fe9da7082b279f043d6':
  Final touches to material theme for phones
 2014-07-17 21:04:25 +00:00
Jeff Davidson
878ca0edb9 Merge "Link WifiAssistant card with actual settings." into lmp-dev 2014-07-17 21:04:20 +00:00
Michael Wright
b8a90e5042 Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 2014-07-17 21:04:20 +00:00
Alexandra Gherghina
d8070b862b am a4b48a95: am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev 
* commit 'a4b48a956f3118c85f93123b1b85ca4abb7069dd':
  Handle choosing and adding accounts for a managed profile
 2014-07-17 20:59:32 +00:00
Dianne Hackborn
8280f115ed am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit 'd0a947692de3e618fa4ed6a5f7f72c6714e088da':
  Battery chart fixes.
 2014-07-17 20:59:13 +00:00
Amith Yamasani
06c8616291 am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev 
* commit '26523d28ad6bd14e30196a990a849c6ba5395177':
  Follow split of DISALLOW_TELEPHONY
 2014-07-17 20:59:08 +00:00
Amith Yamasani
5c2ab1ea14 am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage. 
* commit '0e1aaa0cc8a95d014314220c2453c6606f13428b':
  Revert "Update Location Settings for Enterprise" due to build breakage.
 2014-07-17 20:58:49 +00:00
Zoltan Szatmary-Ban
4d221ca92e am fc9bf4b5: am ca153c55: Update Location Settings for Enterprise 
* commit 'fc9bf4b50b343eb112947baa3ae29fa9754bb369':
  Update Location Settings for Enterprise
 2014-07-17 20:57:06 +00:00
Jeff Davidson
873fa4f2ba Link WifiAssistant card with actual settings. 
Only show the card if we haven't already enabled an assistant, and if
there's one available on the device to enable. (For now, we enable the
first one; in the future, we can offer a selection between
assistants).

When the user opts in, we either show the standard system activity or
the custom opt-in activity if the assistant has defined one. In either
case, we only dismiss the card if the child activity indicates that
opt-in was successful.

Bug: 16376277
Change-Id: Ic92c7676c563ab8c8fb695117a053004f15f7d25
 2014-07-17 13:48:50 -07:00
Zoltan Szatmary-Ban
ef8a48c85b am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev 
* commit 'cda76822c49ba80c8e1f2d000bb80058858f4712':
  Update Location Settings for Enterprise
 2014-07-17 20:16:28 +00:00
Chris Craik
4ce86a69a8 am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev 
* commit 'dd82be9c705196d93986f356f464e6ebfed01002':
  Access high contrast setting directly
 2014-07-17 20:16:28 +00:00
Alexandra Gherghina
46ad810047 am c42d4059: Remove account for a managed user 
* commit 'c42d4059b59848bef7bea550522e29d4ef95e18b':
  Remove account for a managed user
 2014-07-17 20:02:11 +00:00
Alexandra Gherghina
c42d4059b5 Remove account for a managed user 
Bug: 16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
 2014-07-17 19:57:43 +00:00
Przemyslaw Szczepaniak
d7bdf17aba Merge "Make TTS setting transition animation consistent." into lmp-dev 2014-07-17 19:55:10 +00:00
PauloftheWest
995448c76a am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit '08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
  Removed extraneous string from strings.xml
 2014-07-17 19:53:19 +00:00
Alexandra Gherghina
ccdc369e47 Merge "Add account for managed user" into lmp-dev 2014-07-17 19:51:18 +00:00
Alexandra Gherghina
9ce0da9cf1 Add account for managed user 
Bug: 16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1
 2014-07-17 21:18:34 +01:00
Alexandra Gherghina
84d719542d am 7c81c1d1: Handle managing accounts for a managed profile 
* commit '7c81c1d1afd57e61eb4b3000a952f95aa9782c64':
  Handle managing accounts for a managed profile
 2014-07-17 19:49:41 +00:00
Alexandra Gherghina
a4b48a956f am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev 
* commit 'b8fff27ce349f5394b75925d9371857a518fa424':
  Handle choosing and adding accounts for a managed profile
 2014-07-17 19:45:36 +00:00