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

14456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Alan Viverette
6155b14aa2 am c4fe7ee1: am a3fb9cea: am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit 'c4fe7ee1f3f0bd42a176afe7cdd98addb5c21cb8':
 2014-07-17 18:29:53 +00:00
Fabrice Di Meglio
63b1f9d26c am 2c377382: am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '2c377382e78127de9ed1fc6dd6a039b26172b0ee':
 2014-07-17 18:29:53 +00:00
Baligh Uddin
d0285c3d8b am 4e11a8d0: (-s ours) am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4e11a8d01885e6afa1847dc00e4107ec17ba6093':
 2014-07-17 18:29:52 +00:00
Chris Craik
799468be52 am c0cac5fb: am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit 'c0cac5fb50d127332de71cc738c05c8c8fdc41b3':
 2014-07-17 18:29:48 +00:00
Andres Morales
f06797c905 am e9ccaaec: am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit 'e9ccaaecb0f59f72824af9b1fddfab3779f44b94':
 2014-07-17 18:29:47 +00:00
Fabrice Di Meglio
73cf30b47b am 1301b50e: am b5b35fa1: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 
* commit '1301b50e3283a5cbe45cdf8afe562a4cdfdcc56a':
 2014-07-17 18:29:47 +00:00
Lifu Tang
aa55bf443c am cc1c788a: am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit 'cc1c788a8aabd73c4ed079987b8b128911131062':
 2014-07-17 18:29:46 +00:00
PauloftheWest
a5f1dddb68 am 43f00110: am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit '43f001100a0e236f0fe96ca6eac8e0c7934cbfd8':
 2014-07-17 18:29:45 +00:00
PauloftheWest
384d0ac294 am 32e77410: am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit '32e77410c7bfba7b584a1ff76f60c8a4639057e0':
 2014-07-17 18:29:44 +00:00
Paul Lawrence
00427bc9f5 am 9d17fc34: am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '9d17fc34a588e51aece465662d8dd3b3a492f8e9':
 2014-07-17 18:29:43 +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
Alan Viverette
fcb4092248 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 18:19:14 +00:00
Fabrice Di Meglio
1fbd1d8e95 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 18:19:13 +00:00
Baligh Uddin
aa782832e5 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 18:19:13 +00:00
Chris Craik
f12b150be5 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 18:19:12 +00:00
Andres Morales
c1ddf4e6b5 am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit '0128374aae5f9b748ade7d347fd267969ce726b9':
  Increase oem_unlock_enable char limit for translation
 2014-07-17 18:19:11 +00:00
Fabrice Di Meglio
de2f44c6c5 am b5b35fa1: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 
* commit 'b5b35fa1cf8122dca0f10392e6bfb6ee88f1d7f1':
  Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
 2014-07-17 18:18:05 +00:00
Lifu Tang
7faa77ead0 am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 18:16:28 +00:00
PauloftheWest
6da8b0c99a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 18:16:27 +00:00
PauloftheWest
18099f716c am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 18:16:26 +00:00
Paul Lawrence
a6c75963a3 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 18:16:24 +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
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
Fabrice Di Meglio
1301b50e32 am b5b35fa1: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 
* commit 'b5b35fa1cf8122dca0f10392e6bfb6ee88f1d7f1':
  Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
 2014-07-17 17:02:07 +00:00
Lifu Tang
cc1c788a8a am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 17:01:00 +00:00
PauloftheWest
43f001100a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 17:00:59 +00:00
PauloftheWest
32e77410c7 am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 17:00:59 +00:00
Paul Lawrence
9d17fc34a5 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 17:00:58 +00:00
Alan Viverette
a3fb9ceacc am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit '5427b9a7990d408df1f2231ec649501f848f7d3d':
  Update new TimePicker widget to match Settings theme
 2014-07-17 14:18:35 +00:00
Fabrice Di Meglio
4f9f25ac6c am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '9b435f29d72d3be25c97ae3234ba375df055d09d':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 14:15:47 +00:00
Baligh Uddin
28999ebb5f am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a1ed7f2f77f2518809bd369c236fb1d07fe2db6c':
  Import translations. DO NOT MERGE
 2014-07-17 14:15:46 +00:00
Alan Viverette
5427b9a799 Update new TimePicker widget to match Settings theme 
BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6
 2014-07-17 04:36:55 +00:00
Fabrice Di Meglio
e817a66e83 Fix bug #15702424 add-wifi setting screen has no title 
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
 2014-07-16 19:51:06 -07:00