PauloftheWest
88f7fa0b9e
am 8dee66d1
: am 720af580
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 09:07:05 +00:00
Dianne Hackborn
1e6b685828
am 2acec676
: am bf4ecab3
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 09:07:04 +00:00
Dianne Hackborn
0f4c5f15a0
am ff966f2a
: am 829b9975
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 09:07:03 +00:00
Maurice Lam
e1300a2c9b
am ea8db10a
: am 0d09c6c1
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
2014-09-16 09:07:02 +00:00
PauloftheWest
8dee66d124
am 720af580
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '720af58039c31bbf9f239600a898202b971987f5':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 08:52:54 +00:00
Dianne Hackborn
2acec6768f
am bf4ecab3
: am 94aae9af
: Little more on issue #17495264 : tweak when we ignore initial times.
...
* commit 'bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
Little more on issue #17495264 : tweak when we ignore initial times.
2014-09-16 08:52:53 +00:00
Dianne Hackborn
ff966f2a82
am 829b9975
: am ecffbc91
: Merge "Fix issue #17495264 : Battery history graph is bad" into lmp-dev
...
* commit '829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
Fix issue #17495264 : Battery history graph is bad
2014-09-16 08:52:52 +00:00
Maurice Lam
ea8db10ac8
am 0d09c6c1
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
[WifiSetup] Disable app starting window
2014-09-16 08:52:51 +00:00
PauloftheWest
720af58039
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:32:09 +00:00
Dianne Hackborn
bf4ecab3eb
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:32:08 +00:00
Dianne Hackborn
829b9975b6
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:32:07 +00:00
Maurice Lam
0d09c6c190
am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
2014-09-16 08:32:06 +00:00
PauloftheWest
9b6f42b309
am f1fc7219
: am 24233660
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:30:51 +00: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
f1fc721929
am 24233660
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit '2423366021337a4fff71defdd1c6484df10c0e3b':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-15 19:31:20 +00:00
PauloftheWest
2423366021
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:05:48 +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
ea7b2a8d88
am 1097e836
: am 2ce54402
: am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '1097e836e4c1e9a32f1349abce0f9afffecde5cd':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:30:27 +00:00
Prem Kumar
1097e836e4
am 2ce54402
: am c0deb7da
: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
...
* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
Remove UI for Forget AP as a secondary user.
2014-09-15 00:15:04 +00:00
Prem Kumar
2ce5440203
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
ca7f0b395c
am 3ea47dd0
: am 89147d72
: am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit '3ea47dd0631592aaa6c2a89e5e8abb10bd5175eb':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 20:21:37 +00:00
John Spurlock
3ea47dd063
am 89147d72
: am 2e205e9b
: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
...
* commit '89147d726b0f3c4e69f3028c8043f71c14bc6f81':
Settings: Use new PowerManager call to set low power mode.
2014-09-14 20:09:40 +00:00
John Spurlock
89147d726b
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 19:51:01 +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
c950b8f404
am 09504093
: am d03caf70
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '09504093500b6b931cdc87fd696574b64b8d852a':
Renaming Telecomm to Telecom.
2014-09-13 18:19:37 +00:00
Tyler Gunn
0950409350
am d03caf70
: am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit 'd03caf70865f50f74db2613f9d0c68ee50e22190':
Renaming Telecomm to Telecom.
2014-09-13 18:03:11 +00:00
Tyler Gunn
d03caf7086
am 3e71b197
: Renaming Telecomm to Telecom.
...
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
2014-09-13 17:47:28 +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
7dc56e1801
am fd2a3036
: am dbb4a6b7
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit 'fd2a303616523ba3eae5105298bfd5addebb617f':
Prevent PIN/Passwword disappearing during boot
2014-09-13 02:27:46 +00:00
Kenny Guy
072f951cf6
am 31095ca6
: am f57f94e9
: am db9e3f68
: Merge "Fix crash when showing accounts." into lmp-dev
...
* commit '31095ca6e573d5df86e153e6464faa28ae907a75':
Fix crash when showing accounts.
2014-09-13 02:22:20 +00:00
Paul Lawrence
fd2a303616
am dbb4a6b7
: am c64c9808
: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
...
* commit 'dbb4a6b704e8feaba5f31623c66ee30fef8af680':
Prevent PIN/Passwword disappearing during boot
2014-09-12 23:22:13 +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
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
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