OSDN Git Service
John Spurlock [Wed, 17 Sep 2014 19:59:34 +0000 (19:59 +0000)]
am
ab4fe2d9: am
9e51261d: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:53:54 +0000 (19:53 +0000)]
am
9e51261d: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
9e51261dcc5db11be92660a3bde6b1f1e59ee128':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:48:11 +0000 (19:48 +0000)]
am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
PauloftheWest [Wed, 17 Sep 2014 18:49:59 +0000 (18:49 +0000)]
am
63f9500e: am
08183704: am
3cc81aea: Increase char limit for translation.
* commit '
63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:41:09 +0000 (18:41 +0000)]
am
08183704: am
3cc81aea: Increase char limit for translation.
* commit '
0818370405da62d427620da5407ca4c5f9c969a0':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:30:12 +0000 (18:30 +0000)]
am
3cc81aea: Increase char limit for translation.
* commit '
3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
John Spurlock [Wed, 17 Sep 2014 16:55:17 +0000 (12:55 -0400)]
Settings: Ensure CryptKeeper dismisses secure keyguards.
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.
Bug:
17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
PauloftheWest [Wed, 17 Sep 2014 15:30:09 +0000 (08:30 -0700)]
Increase char limit for translation.
Bug:
17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
Maurice Lam [Tue, 16 Sep 2014 19:44:14 +0000 (19:44 +0000)]
am
2ffb10d2: am
fd4e0f25: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
2ffb10d28bd1945004bd29390803a81ce5bf3338':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 19:36:47 +0000 (19:36 +0000)]
am
fd4e0f25: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:47:07 +0000 (18:47 +0000)]
am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:35:38 +0000 (18:35 +0000)]
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
Baligh Uddin [Tue, 16 Sep 2014 18:22:37 +0000 (18:22 +0000)]
am
fbb0218a: (-s ours) am
1741abb9: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fbb0218a117df5537f6ef2835a673ef485e1cdb1':
Import translations. DO NOT MERGE
Maurice Lam [Tue, 16 Sep 2014 03:40:26 +0000 (20:40 -0700)]
[WifiSetup] Update connection state for auto-finish
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.
Bug:
17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
Baligh Uddin [Tue, 16 Sep 2014 18:03:21 +0000 (18:03 +0000)]
am
1741abb9: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
1741abb95c2a30cd10ba829aca345b3d919f3ef6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:26:42 +0000 (15:26 +0000)]
am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Tue, 16 Sep 2014 09:07:08 +0000 (09:07 +0000)]
am
d1cd913a: am
9007cf63: am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
d1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 09:07:07 +0000 (09:07 +0000)]
am
000dd0a6: am
a99ef887: am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
000dd0a6b24a8c383a2051201699bd2c93bc4159':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 09:07:06 +0000 (09:07 +0000)]
am
32c56ed4: am
50b6eec9: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 09:07:05 +0000 (09:07 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 09:07:04 +0000 (09:07 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 09:07:03 +0000 (09:07 +0000)]
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
Maurice Lam [Tue, 16 Sep 2014 09:07:02 +0000 (09:07 +0000)]
am
ea8db10a: am
0d09c6c1: am
795511ec: [WifiSetup] Disable app starting window
* commit '
ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]
am
9007cf63: am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
9007cf6369eee6179082de8c769da6cad4906831':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]
am
a99ef887: am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
a99ef8871e204a04bc2b6436eede2078f8001b98':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 08:52:55 +0000 (08:52 +0000)]
am
50b6eec9: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
50b6eec908fa76dfe426016d621cda3b013846b1':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 08:52:54 +0000 (08:52 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:52:53 +0000 (08:52 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:52:52 +0000 (08:52 +0000)]
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
Maurice Lam [Tue, 16 Sep 2014 08:52:51 +0000 (08:52 +0000)]
am
0d09c6c1: am
795511ec: [WifiSetup] Disable app starting window
* commit '
0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:32:12 +0000 (08:32 +0000)]
am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 08:32:11 +0000 (08:32 +0000)]
am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 08:32:10 +0000 (08:32 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 08:32:09 +0000 (08:32 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:32:08 +0000 (08:32 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:32:07 +0000 (08:32 +0000)]
am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 08:32:06 +0000 (08:32 +0000)]
am
795511ec: [WifiSetup] Disable app starting window
* commit '
795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:30:51 +0000 (08:30 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 02:13:29 +0000 (02:13 +0000)]
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
Edward Jee [Mon, 8 Sep 2014 23:45:29 +0000 (16:45 -0700)]
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug:
17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 16:27:25 +0000 (09:27 -0700)]
Alignment updates for Wi-Fi Settings dialog.
Bug:
17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
Edward Jee [Fri, 5 Sep 2014 05:18:21 +0000 (22:18 -0700)]
Do not show phonebook access permission dialog if pairing dialog has already been shown.
Bug:
16964116,
13886947,
16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
PauloftheWest [Mon, 15 Sep 2014 21:25:13 +0000 (21:25 +0000)]
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Little more on issue #
17495264: tweak when we ignore initial times.
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
Dianne Hackborn [Mon, 15 Sep 2014 20:51:46 +0000 (20:51 +0000)]
Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 19:31:20 +0000 (19:31 +0000)]
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.
PauloftheWest [Mon, 15 Sep 2014 19:05:48 +0000 (19:05 +0000)]
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.
Maurice Lam [Mon, 15 Sep 2014 18:40:34 +0000 (11:40 -0700)]
[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
PauloftheWest [Thu, 11 Sep 2014 23:10:18 +0000 (16:10 -0700)]
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
PauloftheWest [Mon, 15 Sep 2014 14:35:45 +0000 (14:35 +0000)]
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
Baligh Uddin [Mon, 15 Sep 2014 06:05:45 +0000 (23:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Fix issue #
17495264: Battery history graph is bad
Deal better with wall clock time changes in the battery history.
Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
Prem Kumar [Mon, 15 Sep 2014 00:30:27 +0000 (00:30 +0000)]
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.
Prem Kumar [Mon, 15 Sep 2014 00:15:04 +0000 (00:15 +0000)]
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.
Prem Kumar [Mon, 15 Sep 2014 00:00:25 +0000 (00:00 +0000)]
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.
Prem Kumar [Sun, 14 Sep 2014 23:51:21 +0000 (23:51 +0000)]
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 20:21:37 +0000 (20:21 +0000)]
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.
John Spurlock [Sun, 14 Sep 2014 20:09:40 +0000 (20:09 +0000)]
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.
John Spurlock [Sun, 14 Sep 2014 19:51:01 +0000 (19:51 +0000)]
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.
John Spurlock [Sun, 14 Sep 2014 19:36:18 +0000 (19:36 +0000)]
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 15:20:37 +0000 (11:20 -0400)]
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
Tyler Gunn [Sat, 13 Sep 2014 18:19:37 +0000 (18:19 +0000)]
am
09504093: am
d03caf70: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
09504093500b6b931cdc87fd696574b64b8d852a':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 18:03:11 +0000 (18:03 +0000)]
am
d03caf70: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
d03caf70865f50f74db2613f9d0c68ee50e22190':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 17:47:28 +0000 (17:47 +0000)]
am
3e71b197: Renaming Telecomm to Telecom.
* commit '
3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
Tyler Gunn [Wed, 10 Sep 2014 22:21:33 +0000 (15:21 -0700)]
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
Paul Lawrence [Sat, 13 Sep 2014 02:27:46 +0000 (02:27 +0000)]
am
fd2a3036: am
dbb4a6b7: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
fd2a303616523ba3eae5105298bfd5addebb617f':
Prevent PIN/Passwword disappearing during boot
Kenny Guy [Sat, 13 Sep 2014 02:22:20 +0000 (02:22 +0000)]
am
31095ca6: am
f57f94e9: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
31095ca6e573d5df86e153e6464faa28ae907a75':
Fix crash when showing accounts.
Paul Lawrence [Fri, 12 Sep 2014 23:22:13 +0000 (23:22 +0000)]
am
dbb4a6b7: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
dbb4a6b704e8feaba5f31623c66ee30fef8af680':
Prevent PIN/Passwword disappearing during boot
Paul Lawrence [Fri, 12 Sep 2014 22:05:22 +0000 (22:05 +0000)]
am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
Prevent PIN/Passwword disappearing during boot
Paul Lawrence [Fri, 12 Sep 2014 21:44:48 +0000 (21:44 +0000)]
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 20:02:39 +0000 (20:02 +0000)]
am
f57f94e9: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
f57f94e973b9fba78d08301568b109d983d0b425':
Fix crash when showing accounts.
Kenny Guy [Fri, 12 Sep 2014 19:37:38 +0000 (19:37 +0000)]
am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
Paul Lawrence [Wed, 14 May 2014 20:57:06 +0000 (13:57 -0700)]
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
Alexandra Gherghina [Fri, 12 Sep 2014 19:29:07 +0000 (19:29 +0000)]
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
PauloftheWest [Fri, 12 Sep 2014 19:29:06 +0000 (19:29 +0000)]
am
5bebfebe: am
7f7aa9dc: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
5bebfebee715ea60fc30f82f2be220ab13adb04e':
Fixed multiple Bluetooth Settings crashes.
Dianne Hackborn [Fri, 12 Sep 2014 19:27:16 +0000 (19:27 +0000)]
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
Svetoslav [Fri, 12 Sep 2014 19:27:15 +0000 (19:27 +0000)]
am
12c46514: am
06157a11: am
85dcef12: Fix settings crash in print job screen.
* commit '
12c465148fd12cf54aba55028a01edc763e24994':
Fix settings crash in print job screen.
Vinit Deshpande [Fri, 12 Sep 2014 19:18:07 +0000 (19:18 +0000)]
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
Svetoslav [Fri, 12 Sep 2014 19:18:06 +0000 (19:18 +0000)]
am
400cd755: am
a6e4db3c: am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
400cd7554d31d76e7c8dab5d3386d2f038700977':
Fix print icons in settings.
Carlos Valdivia [Fri, 12 Sep 2014 19:18:05 +0000 (19:18 +0000)]
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.
Kenny Guy [Fri, 12 Sep 2014 19:17:09 +0000 (19:17 +0000)]
Merge "Fix crash when showing accounts." into lmp-dev
Baligh Uddin [Fri, 12 Sep 2014 19:16:57 +0000 (19:16 +0000)]
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
Alexandra Gherghina [Fri, 12 Sep 2014 18:53:19 +0000 (18:53 +0000)]
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
PauloftheWest [Fri, 12 Sep 2014 18:53:18 +0000 (18:53 +0000)]
am
7f7aa9dc: am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
7f7aa9dc60602298218cc573e8d30db222bb4442':
Fixed multiple Bluetooth Settings crashes.
Kenny Guy [Fri, 12 Sep 2014 18:49:11 +0000 (19:49 +0100)]
Fix crash when showing accounts.
Accounts page crashed when showing a disabled
manged profile.
Bug:
17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
Alexandra Gherghina [Fri, 12 Sep 2014 17:31:21 +0000 (17:31 +0000)]
am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
PauloftheWest [Fri, 12 Sep 2014 17:31:20 +0000 (17:31 +0000)]
am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
Alexandra Gherghina [Fri, 12 Sep 2014 16:03:52 +0000 (16:03 +0000)]
Merge "Switch to using system-wide default user icons" into lmp-dev
Alexandra Gherghina [Wed, 3 Sep 2014 09:22:09 +0000 (10:22 +0100)]
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
PauloftheWest [Thu, 11 Sep 2014 22:21:00 +0000 (15:21 -0700)]
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
PauloftheWest [Fri, 12 Sep 2014 13:06:41 +0000 (13:06 +0000)]
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 05:48:45 +0000 (05:48 +0000)]
am
901df0c3: am
a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '
901df0c3744e16d5a86e377583ea96d5a8b687dc':
Fix some things in settings: manage apps, battery, procstats
Svetoslav [Fri, 12 Sep 2014 05:48:44 +0000 (05:48 +0000)]
am
06157a11: am
85dcef12: Fix settings crash in print job screen.
* commit '
06157a11cd16116a04596235dfac139ae1fb01f8':
Fix settings crash in print job screen.
Dianne Hackborn [Fri, 12 Sep 2014 05:09:07 +0000 (05:09 +0000)]
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
Svetoslav [Fri, 12 Sep 2014 05:06:32 +0000 (05:06 +0000)]
am
85dcef12: Fix settings crash in print job screen.
* commit '
85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
Dianne Hackborn [Fri, 12 Sep 2014 02:24:16 +0000 (02:24 +0000)]
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 01:09:29 +0000 (18:09 -0700)]
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
OSDN Git Service
