PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,215 Commits 1 Branch 0 Tags
69010fb13af1de42e17e78772c5f85bb1fa28374
Commit Graph

15215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Jee
69010fb13a am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit 'ea9c43ca6503d6bd57f7258341a41a664c7a7cee':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 17:18:15 +00:00
PauloftheWest
3724edb357 am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit 'f4713e0fad08dbcde9b61ad2bf8ec646d8022c14':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 17:18:15 +00:00
Dianne Hackborn
4e2f9ca6db am 99b1261c: am 9e4b5269: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '99b1261c1f0ea0e71d41014e6fdddbf3f1912bcb':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 17:18:14 +00:00
Dianne Hackborn
5df5798e61 am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit '6d9988e79ec5b8d1480f50e45fe58e358574115b':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 17:18:13 +00:00
Maurice Lam
9bfbf6426b am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window 
* commit '24956de0e0405ee3165d289ce74a87e70855b46b':
  [WifiSetup] Disable app starting window
 2014-09-16 17:18:12 +00:00
Edward Jee
ea9c43ca65 am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '299faadbfc73f62ed0e8be968d62a42daf203e87':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 16:47:34 +00:00
PauloftheWest
f4713e0fad am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '99f7d73b4722b196ba66d9e70741db0ced53b3c9':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 16:47:33 +00:00
Dianne Hackborn
99b1261c1f am 9e4b5269: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '9e4b526951eaccc4aeb1d85a5d9e52a996a7b1d0':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 16:47:32 +00:00
Dianne Hackborn
6d9988e79e am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ebcba9dca7290cf1e4f1d263408f1af98b89a853':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 16:47:31 +00:00
Maurice Lam
24956de0e0 am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window 
* commit '95b283aabd26a757bc80abf6beff36346d15b20b':
  [WifiSetup] Disable app starting window
 2014-09-16 16:47:30 +00:00
Edward Jee
299faadbfc am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:31:58 +00:00
PauloftheWest
99f7d73b47 am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:31:57 +00:00
Dianne Hackborn
9e4b526951 am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '94aae9afd18c17848aed68addd19d93c937c7555':
  Little more on issue #17495264: tweak when we ignore initial times.
 2014-09-16 08:31:56 +00:00
Dianne Hackborn
ebcba9dca7 am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
  Fix issue #17495264: Battery history graph is bad
 2014-09-16 08:31:55 +00:00
Maurice Lam
95b283aabd am 795511ec: [WifiSetup] Disable app starting window 
* commit '795511ec9c952041afb158d43dd22960443b503f':
  [WifiSetup] Disable app starting window
 2014-09-16 08:31:54 +00:00
PauloftheWest
9de624d837 am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '7b03a45227a304b9407e565994c491dbee64e4cd':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-16 08:29:09 +00:00
Edward Jee
b0954c1d1e Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 2014-09-16 01:19:07 +00:00
Edward Jee
a539716a94 Do not show phonebook access permission dialog if pairing dialog has already been shown. 
Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
 2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20 Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 2014-09-15 21:25:13 +00:00
Dianne Hackborn
94aae9afd1 Little more on issue #17495264: tweak when we ignore initial times. 
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
 2014-09-15 14:00:37 -07:00
Dianne Hackborn
ecffbc91b1 Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 2014-09-15 20:51:46 +00:00
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
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
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