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
Fabrice Di Meglio
ed4bec4697 am f54cdcdd: am c63f16ce: am c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev 
* commit 'f54cdcdd36a93f00dc707090f34ee9476210ef99':
  Fix alignment of ActionBar title and Preferences for tablet UI
 2014-07-18 03:14:29 +00:00
Tadashi G. Takaoka
1c88aa8848 am 02d8341c: am 740de4d3: am 3ac7802e: Fix duplicate string resources 
* commit '02d8341ca4dc3db2262eac8ce4bd56de46687655':
  Fix duplicate string resources
 2014-07-18 03:14:28 +00:00
Michael Wright
9f879c0f24 am 9292e270: am 87b69c30: am b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev 
* commit '9292e27026bec67f4facd16ce35576b778d208e7':
  Add OP_PROJECT_MEDIA to AppOps
 2014-07-18 00:37:57 +00:00
Paul Lawrence
81b3dd3a9b am 951b69ee: am 2126ac9f: am eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev 
* commit '951b69ee6525cfb09311b488a20e3544e446f665':
  Final touches to material theme for phones
 2014-07-17 23:54:04 +00:00
Baligh Uddin
befb4e2e79 Remove deprecated locales 
Change-Id: If897a5a2b65236d1b9da8b01198b9292602ee179
 2014-07-17 15:43:14 -07:00
Zoltan Szatmary-Ban
77a1145b49 am dc262042: am ef8a48c8: am cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev 
* commit 'dc2620425d567db260129dbd77fca8fe9fc8cf09':
  Update Location Settings for Enterprise
 2014-07-17 22:00:01 +00:00
Chris Craik
3a965f6a92 am 7c6c12f8: am 4ce86a69: am dd82be9c: Merge "Access high contrast setting directly" into lmp-dev 
* commit '7c6c12f8858720cf9b42451974b7253cc12b9a85':
  Access high contrast setting directly
 2014-07-17 21:59:58 +00:00
Alexandra Gherghina
d365772a8b am 692b03c4: am 46ad8100: am c42d4059: Remove account for a managed user 
* commit '692b03c49ecdbb98f913ee90025f9732fa3e7eba':
  Remove account for a managed user
 2014-07-17 21:59:57 +00:00
PauloftheWest
6c023caec0 am e4a04c83: am 995448c7: am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit 'e4a04c83f5d8928262a5fdc4ff993917d43cd2d5':
  Removed extraneous string from strings.xml
 2014-07-17 21:59:56 +00:00
Alexandra Gherghina
393e747245 am 85d6818c: am 84d71954: am 7c81c1d1: Handle managing accounts for a managed profile 
* commit '85d6818cf215254423320e80b4a9523df66ae485':
  Handle managing accounts for a managed profile
 2014-07-17 21:59:56 +00:00
Alexandra Gherghina
09f6ebb037 am d8070b86: am a4b48a95: am b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev 
* commit 'd8070b862bfe3cbd64c489d8e22facae35202d47':
  Handle choosing and adding accounts for a managed profile
 2014-07-17 21:04:18 +00:00
Dianne Hackborn
0ba35a9b12 am 8280f115: am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit '8280f115ed511100cd981141ee8301ce723d2ceb':
  Battery chart fixes.
 2014-07-17 21:04:17 +00:00
Amith Yamasani
ae2e8795eb am 06c86162: am 26523d28: am f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev 
* commit '06c861629162e097cb4c6f116161cf326261c8e4':
  Follow split of DISALLOW_TELEPHONY
 2014-07-17 21:04:16 +00:00
Amith Yamasani
0847de429a am 5c2ab1ea: am 0e1aaa0c: am d888b543: Revert "Update Location Settings for Enterprise" due to build breakage. 
* commit '5c2ab1ea149276a64171b936b0daee3255c65575':
  Revert "Update Location Settings for Enterprise" due to build breakage.
 2014-07-17 21:04:16 +00:00
Zoltan Szatmary-Ban
9830b3195e am 4d221ca9: am fc9bf4b5: am ca153c55: Update Location Settings for Enterprise 
* commit '4d221ca92e2ea9c94235b33493d2c6adbd8be48a':
  Update Location Settings for Enterprise
 2014-07-17 21:04:11 +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
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
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
Przemyslaw Szczepaniak
91b620082c Make TTS setting transition animation consistent. 
Bug: 16345246
Change-Id: I729b2f35735ab03424acca07c4a9eb27541a356b
 2014-07-17 15:56:50 +01: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