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

14486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dianne Hackborn
be875db541 Merge "Battery chart fixes." into lmp-dev 2014-07-17 17:59:02 +00:00
Dianne Hackborn
c19eb361a4 Battery chart fixes. 
When there is no data to show, don't make a crazy collapsed chart.

Also avoid re-creating the chart when scrolling.

And fix various other things.

Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
 2014-07-17 12:09:54 -07:00
Zoltan Szatmary-Ban
ca153c55dd 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: Ib0fdb9f0c811307875296c37bab6d1fbab919022
 2014-07-17 18:47:17 +01:00
Alan Viverette
c4fe7ee1f3 am a3fb9cea: am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit 'a3fb9ceacceafd863c49cc958e9b2eb90f27492e':
  Update new TimePicker widget to match Settings theme
 2014-07-17 17:03:26 +00:00
Fabrice Di Meglio
2c377382e7 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 17:03:25 +00:00
Baligh Uddin
4e11a8d018 am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '28999ebb5feed6fab786fd85cd11975f681ae3c6':
  Import translations. DO NOT MERGE
 2014-07-17 17:03:24 +00:00
Chris Craik
c0cac5fb50 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 17:03:23 +00:00
Andres Morales
e9ccaaecb0 am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit '0128374aae5f9b748ade7d347fd267969ce726b9':
  Increase oem_unlock_enable char limit for translation
 2014-07-17 17:03:23 +00:00