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
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
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
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
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
86e452f957
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 20:12:59 +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
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
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
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
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
PauloftheWest
37b1253a01
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
2014-09-12 13:06:42 +00:00
Dianne Hackborn
364ca371a3
am a5780340
: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
...
* commit 'a5780340fcf8f8910f1aa1197c604be32ff6a5cf':
Fix some things in settings: manage apps, battery, procstats
2014-09-12 07:28:47 +00:00
Svetoslav
c50841caa9
am 85dcef12
: Fix settings crash in print job screen.
...
* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
2014-09-12 07:24:46 +00:00
Dianne Hackborn
a5780340fc
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
2014-09-12 02:24:17 +00:00
Dianne Hackborn
c891ce6565
Fix some things in settings: manage apps, battery, procstats
...
Issue #17461567 : java.lang.ArithmeticException: divide by zero when
looking at Settings > Battery
Yeah, let's not do that.
Issue #17365562 : Running services RAM totals are wrong
Okay so like a few months ago, I had this vacation coming up, and
it was around the feature complete (hahah) deadline, and I had to
rush to get this in before I left. So I rushed. And, well, I forgot
a few things. Here they are. We now show the right numbers and
even update things correctly when you change what processes are
being shown. Wow.
Finally, fixed a few issues in the dev tools procstats UI.
Change-Id: I8348a9c2ec3226a455c5c8465729e4487f324c8b
2014-09-11 18:09:29 -07:00
Svetoslav
85dcef1226
Fix settings crash in print job screen.
...
The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.
bug:17471952
Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0
2014-09-11 14:30:18 -07:00
PauloftheWest
8d6991348b
Fixed multiple Bluetooth Settings crashes.
...
+ Fixed a crash when selecting On/Off multiple times on an input device.
+ Fixed a crash when visiting different Bluetooth Settings after
disabling an input device.
Bug: 17402421
Change-Id: I23efa3a36ba8cf0df02cf41397586a10dae9e08c
2014-09-11 12:36:58 -07:00
Vinit Deshpande
c471629c7d
am 0a11f605
: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:25:46 +00:00
Vinit Deshpande
0a11f60595
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
2014-09-11 18:17:00 +00:00
Svetoslav
842e9d04ad
am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:39:26 +00:00
Carlos Valdivia
a8627dd88e
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 'f79797c8853741e80668f1d91c4d7d1a076bac18':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:39:25 +00:00
Svetoslav
72cfbcb429
Merge "Fix print icons in settings." into lmp-dev
2014-09-11 17:28:32 +00:00
Carlos Valdivia
f79797c885
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 'ea2fa0d98a9777e37815624bf3e4345b4c6df643':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:25:05 +00:00
Carlos Valdivia
ea2fa0d98a
am db591467
: am 737d2d53
: am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit 'db591467f6ae0e082c0ce627874a851f1926d63a':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:12:11 +00:00
Carlos Valdivia
db591467f6
am 737d2d53
: am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:05:31 +00:00
Carlos Valdivia
737d2d538b
am 61ced6d4
: am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '61ced6d4270b86c336520856cb1545865cb01107':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:59:49 +00:00
Carlos Valdivia
61ced6d427
am 01137c20
: am 663b4e97
: am 37b58a42
: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:49:32 +00:00