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

14762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Przemyslaw Szczepaniak
6819395326 Merge "Fix showing list of languages for picoTTS" 2014-07-17 19:45:26 +00:00
Przemyslaw Szczepaniak
e0d519f3cf Fix showing list of languages for picoTTS 
PicoTTS have a tendency to return a
CHECK_VOICE_DATA_MISSING_DATA for its CHECK_TTS_DATA
activity. This blanks the language selection preference.
The fix is to show languages selection for all
results of CHECK_TTS_DATA that are not a total failure
(TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL).

Change-Id: I984d7cc9b0dc830ad2b8195a820f9b6fc4ddf1e0
 2014-07-21 16:27:00 +01:00
Adam Lesinski
f174153e84 am 3a2a4720: am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API 
* commit '3a2a4720c175b0dfacace18bade0f99b09e056f4':
  Update Settings to use new UsageStats API
 2014-07-20 02:27:45 +00:00
Baligh Uddin
b2e82747f9 Merge "Remove deprecated locales" 2014-07-18 18:24:25 +00:00
Jeff Davidson
3e45c50e3f am d1c3840e: am 2622bd75: am 878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev 
* commit 'd1c3840ede3d715aa0dcca7f2b6f69ea432c87e9':
  Link WifiAssistant card with actual settings.
 2014-07-18 22:15:34 +00:00
Paul Lawrence
09bed7dd55 am 17b1690d: am bf052423: am 312927ab: Material fixes for tablets 
* commit '17b1690d5f98cb687dcbb0f5a1d18f6446a938a8':
  Material fixes for tablets
 2014-07-18 20:02:43 +00:00
Maurice Lam
899cfeb1df am 836e70f4: am a4980833: am b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev 
* commit '836e70f406f81fa9be8d675af0438ab29df62841':
  [WifiSetup] Mechanism for suspending auto finish
 2014-07-18 19:23:08 +00:00
PauloftheWest
2e6e981518 am e25fcbf1: am 72e4a85b: am 772cf206: Merge "Minor string fixes for translation" into lmp-dev 
* commit 'e25fcbf1f4eebf2aa588522f5d9aa248e77a8e0e':
  Minor string fixes for translation
 2014-07-18 19:05:05 +00:00
Baligh Uddin
9ab097413a Remove deprecated locales 
Change-Id: Ibba34d691800aaa4fad4f4e8cfe6ca09aaae2cd3
 2014-07-18 11:43:06 -07:00
Zoltan Szatmary-Ban
cda76822c4 Merge "Update Location Settings for Enterprise" into lmp-dev 2014-07-17 19:45:26 +00:00
Zoltan Szatmary-Ban
925560e9a2 Update Location Settings for Enterprise 
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.

Bug: 15467321
Change-Id: Ic52ed3d01a0816288d4818190e82befa5235f28b
 2014-07-17 21:11:48 +01:00
Alexandra Gherghina
7c81c1d1af Handle managing accounts for a managed profile 
Bug: 15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
 2014-07-17 19:42:46 +00:00
John Spurlock
59ea80b781 Merge "Settings: No really, keep the trailing space." into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
de42b8b62e Settings: No really, keep the trailing space. 
Bug:16487510
Change-Id: Ic10ace9803c7d488240d819427ffec412a10d81a
 2014-07-22 15:17:49 -04:00
Dianne Hackborn
d0a947692d am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit 'be875db541d673aa62dd99acebc523a26018616e':
  Battery chart fixes.
 2014-07-17 19:25:51 +00:00
Amith Yamasani
26523d28ad am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev 
* commit 'f1d56ebb111d10779b25f1105c3077cd9fd39890':
  Follow split of DISALLOW_TELEPHONY
 2014-07-17 19:21:46 +00:00
Tadashi G. Takaoka
686c250323 Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev 2014-07-17 19:20:15 +00:00
Tadashi G. Takaoka
5d56f6217f Use OnPreferenceChangeLister for subtype enabler 
Change-Id: Id9eaed14803b6c4e194f1cf62900de0a053da012
 2014-07-22 16:23:50 +00:00
Fabrice Di Meglio
592a17aa3c Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev 2014-07-17 19:20:15 +00:00
Baligh Uddin
0f364cdf63 Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 2014-07-17 19:20:15 +00:00
Baligh Uddin
a45d1f8320 Remove deprecated locales - DO NOT MERGE 
Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4
 2014-07-19 13:05:24 -07:00
Paul Lawrence
eb0628bb02 Merge "Final touches to material theme for phones" into lmp-dev 2014-07-17 19:13:40 +00:00
Paul Lawrence
aa05738cd2 Final touches to material theme for phones 
Fix layout
Improve text color/size
Improve edit box look
Hide status bar at top

Bug: 15328359
Change-Id: Ia0ea75c74b352963ccf47db0ff7c9684adc1f2a3
 2014-07-17 13:29:23 -07:00
Amith Yamasani
0e1aaa0cc8 am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage. 
* commit 'd888b543b2c188e59ea537ba4e73bf9253fbfc93':
  Revert "Update Location Settings for Enterprise" due to build breakage.
 2014-07-17 18:31:38 +00:00
Amith Yamasani
d888b543b2 Revert "Update Location Settings for Enterprise" due to 
build breakage.

This reverts commit ca153c55dd.

Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
 2014-07-17 18:26:38 +00:00
Zoltan Szatmary-Ban
fc9bf4b50b am ca153c55: Update Location Settings for Enterprise 
* commit 'ca153c55dda9e654f20cd21897fedf986bb95a2e':
  Update Location Settings for Enterprise
 2014-07-17 18:03:56 +00:00
Fabrice Di Meglio
6f40485308 Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
d0a057ccc8 Merge "Improvements to user settings" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings 
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
 2014-07-17 20:22:08 -07:00
Baligh Uddin
d1439b1173 Merge "Remove deprecated locales" 2014-07-17 17:59:02 +00:00
Andres Morales
e927437bd6 am 7d6a6ebc: am 5b452a11: am 7ab8929c: On factory reset, wipe the stored account challenges 
* commit '7d6a6ebc81a90e2439a8d38710a85af7a750db66':
  On factory reset, wipe the stored account challenges
 2014-07-18 16:54:24 +00:00
Amith Yamasani
a81d42e77f am 0e62c43d: am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev 
* commit '0e62c43d72c1c66c6f9790c8771d5e2c465d8f75':
  Improvements to user settings
 2014-07-18 15:10:35 +00:00
Alexandra Gherghina
10fb11d109 am ec2786a9: am 527f0d20: am 89265a30: Hide Settings launcher icon for a managed profile 
* commit 'ec2786a9b5b05141522f929efe5145a3778bc98d':
  Hide Settings launcher icon for a managed profile
 2014-07-18 13:14:06 +00:00
Alexandra Gherghina
3cbac3eea4 am 17c9d3c9: am a41da78e: am ccdc369e: Merge "Add account for managed user" into lmp-dev 
* commit '17c9d3c92c897e828d5332cf6e3b230fd1041a10':
  Add account for managed user
 2014-07-18 13:14:06 +00:00