PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,151 Commits 1 Branch 0 Tags
19a1a8c3f90b97a1258c249652c1849fecf2d0fc
Commit Graph

17151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2dd62886fa am f053f532: (-s ours) am a2e918af: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f053f532cedfeb846b893f754d96f95647b9bd5f':
  Import translations. DO NOT MERGE
 2014-09-12 23:05:43 +00:00
Dan Sandler
fecd898985 am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev 
* commit '99e467a75e7e2e671368817ea0f2a1efe50a373e':
  Show a better list of apps.
 2014-09-12 23:05:42 +00:00
Zoltan Szatmary-Ban
bc8f3d08d7 am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev 
* commit '118cf516c22b86e501029529cd110c9c9e20dcf9':
  Check for DeviceAdminInfo type before casting
 2014-09-12 23:05:41 +00:00
Zoltan Szatmary-Ban
2349624368 am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev 
* commit 'b2259b3a55f462517fa6d8a3e58d07433da19087':
  Fixing Trusted Credentials Settings crash
 2014-09-12 23:05:39 +00:00
Fabrice Di Meglio
88ff5747b6 am a2bba88b: am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev 
* commit 'a2bba88bc857100afc9342535c3aa4284fab5858':
  Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
 2014-09-12 23:05:38 +00:00
PauloftheWest
08455c5791 am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage. 
* commit 'c1806600c426236a0ff028f67ca410fac98af020':
  Added bluetooth_device_settings_header to fix build breakage.
 2014-09-12 23:05:37 +00:00
Jim Miller
0787af48c7 am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev 
* commit '825eb63c1b26b2906ebfb680e386ebfebebec0f6':
  Keep unlock attempt count after configuration change
 2014-09-12 23:05:36 +00:00
Baligh Uddin
c742cfc716 am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6f96fcc5a3fe4530e332935ade3cf061e13b9f24':
  Import translations. DO NOT MERGE
 2014-09-12 23:05:35 +00:00
Paul Lawrence
db51c76a4c am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit '7f4c4fb5b6e05eb5affe5f64381e0b5374c869db':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 22:25:36 +00:00
Paul Lawrence
7f4c4fb5b6 am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 22:05:33 +00:00
Paul Lawrence
dbb4a6b704 am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 22:05:22 +00:00
Paul Lawrence
c64c9808b9 Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 2014-09-12 21:44:48 +00:00
Kenny Guy
28d2fa6215 am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit '1ede808c61bd0a9c420ca2eb532cbbc31881cad5':
  Fix crash when showing accounts.
 2014-09-12 20:03:01 +00:00
Kenny Guy
31095ca6e5 am f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'f57f94e973b9fba78d08301568b109d983d0b425':
  Fix crash when showing accounts.
 2014-09-12 20:02:39 +00:00
Kenny Guy
f57f94e973 am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
  Fix crash when showing accounts.
 2014-09-12 19:37:38 +00:00
Kenny Guy
1ede808c61 am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
  Fix crash when showing accounts.
 2014-09-12 19:37:22 +00:00
Paul Lawrence
5ab67c5648 Prevent PIN/Passwword disappearing during boot 
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.

Ignore this change since it is immaterial to what we display.

Bug: 17421115

Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
 2014-09-12 12:35:18 -07:00
Alexandra Gherghina
b5c7c79a0a am 02d41b91: am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit '02d41b916c24eb458b7ce695d0663cbe6c49a4b8':
  Switch to using system-wide default user icons
 2014-09-12 19:29:07 +00:00
PauloftheWest
dbdbdda17e am 5bebfebe: am 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '5bebfebee715ea60fc30f82f2be220ab13adb04e':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 19:29:06 +00:00
Dianne Hackborn
a766826b9b am a1b53ad6: am 901df0c3: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit 'a1b53ad6c40039b9d313ae9127cbb35f1287ff34':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 19:27:16 +00:00
Svetoslav
cbe6550d38 am 12c46514: am 06157a11: am 85dcef12: Fix settings crash in print job screen. 
* commit '12c465148fd12cf54aba55028a01edc763e24994':
  Fix settings crash in print job screen.
 2014-09-12 19:27:15 +00:00
Vinit Deshpande
fac1ec0326 am eaacf6a4: am 57bef54b: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit 'eaacf6a4fda027868ea5408dfd49365c4be3186e':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-12 19:18:07 +00:00
Svetoslav
f759e33cd5 am 400cd755: am a6e4db3c: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev 
* commit '400cd7554d31d76e7c8dab5d3386d2f038700977':
  Fix print icons in settings.
 2014-09-12 19:18:06 +00:00
Carlos Valdivia
d6bbc727c0 am 4069299a: am 15fbbbc8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties. 
* commit '4069299a4ce7eaac4ac21de3ab683173607169a8':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-12 19:18:05 +00:00
Kenny Guy
db9e3f682f Merge "Fix crash when showing accounts." into lmp-dev 2014-09-12 19:17:10 +00:00
Baligh Uddin
9143ed9b25 am e69b7d19: (-s ours) am 0d2c8d34: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e69b7d19f3920f170240a8b790dba1113d0e53da':
  Import translations. DO NOT MERGE
 2014-09-12 19:16:57 +00:00
Alexandra Gherghina
cd321d81f7 am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit '69af2c6adc6adea77254c4709ac0c7d1ae9e8d00':
  Switch to using system-wide default user icons
 2014-09-12 18:56:26 +00:00
PauloftheWest
6c1d69ba45 am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '9f96ac6f737d10d7b881d66053a862fa698f87dc':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 18:56:25 +00:00
Alexandra Gherghina
02d41b916c am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit '0bf3dc02ce5fa69271ba993b3d2ed0689c292002':
  Switch to using system-wide default user icons
 2014-09-12 18:53:19 +00:00
PauloftheWest
5bebfebee7 am 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '7f7aa9dc60602298218cc573e8d30db222bb4442':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 18:53:18 +00:00
Kenny Guy
7b72e2835b Fix crash when showing accounts. 
Accounts page crashed when showing a disabled
manged profile.

Bug: 17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
 2014-09-12 19:49:11 +01:00
Alexandra Gherghina
0bf3dc02ce am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
  Switch to using system-wide default user icons
 2014-09-12 17:31:21 +00:00
PauloftheWest
7f7aa9dc60 am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 17:31:20 +00:00
Alexandra Gherghina
69af2c6adc am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
  Switch to using system-wide default user icons
 2014-09-12 17:27:25 +00:00
PauloftheWest
9f96ac6f73 am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 17:27:25 +00:00
Alexandra Gherghina
f738895dc0 Merge "Switch to using system-wide default user icons" into lmp-dev 2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da Switch to using system-wide default user icons 
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.

Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
 2014-09-12 17:00:40 +01:00
PauloftheWest
7e6e7acbf1 Updated Wi-Fi Settings icons to new filled-in teal format. 
+ Added a filled-in teal Wi-Fi unlocked and locked icons.
+ Added a teal theme to Settings.
+ Updated Wi-Fi Settings and Setup Wizard to use the new teal format.
+ Updated the Settings icon (used in the Settings dashboard and in
search) to the new format.

Bug: 17331199
Change-Id: I0565ef6f2fa1be035c1bd150ea853cb976dc504c
 2014-09-12 07:18:10 -07:00
Dianne Hackborn
c857cddf89 am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit '364ca371a38b1f844f1f1e614133f0592fe04001':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 13:59:18 +00:00
Svetoslav
c33aef207e am c50841ca: am 85dcef12: Fix settings crash in print job screen. 
* commit 'c50841caa924f6c3af92c10d377b336e6cc6641d':
  Fix settings crash in print job screen.
 2014-09-12 13:59:18 +00:00
Vinit Deshpande
7aaccec09c am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit 'c471629c7d98403be92a1cb30f04612a9d12b7bc':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-12 13:59:17 +00:00
Svetoslav
536cb798f3 am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev 
* commit '842e9d04ade970409f930686d875644e3d827e19':
  Fix print icons in settings.
 2014-09-12 13:59:16 +00:00
Carlos Valdivia
456fbe88d0 am a8627dd8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties. 
* commit 'a8627dd88e7632e452806a70b62c192111b30c57':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-12 13:59:15 +00:00
Baligh Uddin
f053f532ce am a2e918af: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a2e918af43fc011e49c39187e55e0707789438b9':
  Import translations. DO NOT MERGE
 2014-09-12 13:59:14 +00:00
Dan Sandler
99e467a75e am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev 
* commit 'e98bee54be5b8ca17e5860d34bac9d56116777d9':
  Show a better list of apps.
 2014-09-12 13:59:13 +00:00
Zoltan Szatmary-Ban
118cf516c2 am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev 
* commit '55cd479d5511d9806a129cc4b40be7df79955197':
  Check for DeviceAdminInfo type before casting
 2014-09-12 13:59:12 +00:00
Zoltan Szatmary-Ban
b2259b3a55 am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev 
* commit 'b46eeeb7be7dbf7b791c0527e096771032112321':
  Fixing Trusted Credentials Settings crash
 2014-09-12 13:59:11 +00:00
Fabrice Di Meglio
a2bba88bc8 am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev 
* commit 'b88d24df0e0c804cf9c742411e4a6809ead3f020':
  Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
 2014-09-12 13:59:10 +00:00
PauloftheWest
c1806600c4 am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage. 
* commit '23d0ac449119cb30de08d03fb38f92e87c9009ed':
  Added bluetooth_device_settings_header to fix build breakage.
 2014-09-12 13:59:09 +00:00
Jim Miller
825eb63c1b am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev 
* commit 'f496ae94138e44d623819afdc4d0893acb27f3fc':
  Keep unlock attempt count after configuration change
 2014-09-12 13:59:09 +00:00