PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,496 Commits 1 Branch 0 Tags
04b3b84d30d723e71ea501b929f7b4af81e1150d
Commit Graph

15496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
7b03a45227 am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit 'dc985292be99c6330ec26a912a5d025f0986158a':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:29:39 +00:00
PauloftheWest
dc985292be am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:04:58 +00:00
Maurice Lam
795511ec9c [WifiSetup] Disable app starting window 
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.

Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
 2014-09-15 11:40:34 -07:00
Sander Alewijnse
e625a57a28 Update targetSdkVersion check. 
Bug:16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
 2014-09-15 18:55:56 +01:00
PauloftheWest
f4b548c0f5 Removed all references to "Google Wi-Fi Assistant" from Settings. 
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
 2014-09-15 09:31:56 -07:00
PauloftheWest
13fbd848d4 Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 2014-09-15 14:35:46 +00:00
Baligh Uddin
9ad0d03486 Import translations. DO NOT MERGE 
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
 2014-09-14 23:05:45 -07:00
Dianne Hackborn
2b54a9fa57 Fix issue #17495264: Battery history graph is bad 
Deal better with wall clock time changes in the battery history.

Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
 2014-09-14 19:17:17 -07:00
Prem Kumar
02f66ba78c am 07e5ea99: am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '07e5ea995b5fdbb24b9d53a93db7f19220308ce2':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:30:42 +00:00
Prem Kumar
07e5ea995b am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '319e7a27c89afc5e1da54e7a3b33943e89e79211':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:15:41 +00:00
Prem Kumar
319e7a27c8 am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0 Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 2014-09-14 23:51:21 +00:00
John Spurlock
c9f6945fc8 am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit 'be0827ddf3c0c54b4810ea98f58fd9af29a07461':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 21:38:50 +00:00
John Spurlock
be0827ddf3 am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit 'f97ec5468407fa6ce66ddb9f72022867c50e72cd':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 21:17:53 +00:00
John Spurlock
f97ec54684 am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 21:04:52 +00:00
John Spurlock
2e205e9b4b Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 2014-09-14 19:36:20 +00:00
John Spurlock
41e8351448 Settings: Use new PowerManager call to set low power mode. 
Bind the master switch to the power manager state instead
of directly to the single setting.

Depends on frameworks/base change:
  Ic030504c9cad9868a7137abbe837b170da37852b

Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
 2014-09-14 11:23:01 -04:00
Tyler Gunn
2b3505edb2 am 8bad5a2d: am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom. 
* commit '8bad5a2d0d972ab87a1d59539e25504de1b679c4':
  Renaming Telecomm to Telecom.
 2014-09-13 20:46:44 +00:00
Tyler Gunn
8bad5a2d0d am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom. 
* commit '86e452f9577e37dfae4f7160a28448b66084e5d9':
  Renaming Telecomm to Telecom.
 2014-09-13 20:28:52 +00:00
Tyler Gunn
86e452f957 am 3e71b197: Renaming Telecomm to Telecom. 
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
  Renaming Telecomm to Telecom.
 2014-09-13 20:12:59 +00:00
Paul Lawrence
36d8bd3bf7 am db51c76a: am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'db51c76a4ce7c0d7690444380f3dce7100336c11':
  Prevent PIN/Passwword disappearing during boot
 2014-09-13 03:58:49 +00:00
Kenny Guy
daa4a46633 am 28d2fa62: am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit '28d2fa6215acd25f362f512103b8659420b6ee52':
  Fix crash when showing accounts.
 2014-09-13 03:42:02 +00:00
Tyler Gunn
3e71b197f7 Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
 2014-09-12 20:22:25 -07:00
Alexandra Gherghina
7a09535c73 am cd321d81: am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit 'cd321d81f72cc9ef20b2d62d40589593588ee353':
  Switch to using system-wide default user icons
 2014-09-12 23:10:08 +00:00
PauloftheWest
e438c38323 am 6c1d69ba: am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '6c1d69ba452db01af820243f6ff917b7f85c6d19':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 23:10:03 +00:00
Dianne Hackborn
f7acc1b311 am c857cddf: am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit 'c857cddf899588efc2d65dcc34ba448ababab594':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 23:05:48 +00:00
Svetoslav
0a91a8d24d am c33aef20: am c50841ca: am 85dcef12: Fix settings crash in print job screen. 
* commit 'c33aef207ec1536157acd1a0bd1b03c51de7a9a9':
  Fix settings crash in print job screen.
 2014-09-12 23:05:47 +00:00
Vinit Deshpande
84912814f5 am 7aaccec0: am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit '7aaccec09c269d0fe680bbe5eea344d0366cd5eb':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-12 23:05:46 +00:00
Svetoslav
9af0fce66a am 536cb798: am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev 
* commit '536cb798f35ad1ce86699eb1bac0ba0a895c011f':
  Fix print icons in settings.
 2014-09-12 23:05:45 +00:00
Carlos Valdivia
4806e47d55 am 456fbe88: 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 '456fbe88d05c933e54c3c73e20d3a48edf2eee06':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-12 23:05:44 +00:00
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
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
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
Kenny Guy
db9e3f682f Merge "Fix crash when showing accounts." into lmp-dev 2014-09-12 19:17:10 +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
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
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