Commit Graph

15471 Commits

Author SHA1 Message Date
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
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
13fbd848d4 Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 2014-09-15 14:35:46 +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
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
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
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
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
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
0bf3dc02ce 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:31:21 +00:00
PauloftheWest
7f7aa9dc60 am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
  Fixed multiple Bluetooth Settings crashes.
2014-09-12 17:31:20 +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
901df0c374 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 05:09:07 +00:00
Svetoslav
06157a11cd am 85dcef12: Fix settings crash in print job screen.
* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
  Fix settings crash in print job screen.
2014-09-12 05:06:32 +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
57bef54bef 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:06 +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
a6e4db3ce0 am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
  Fix print icons in settings.
2014-09-11 17:40:06 +00:00
Carlos Valdivia
15fbbbc8b1 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:40:03 +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
Carlos Valdivia
01137c2004 am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:42:54 +00:00
Carlos Valdivia
663b4e9733 am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:37:09 +00:00
Baligh Uddin
0d2c8d34d9 am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
  Import translations. DO NOT MERGE
2014-09-11 15:58:44 +00:00
Baligh Uddin
9b45212b1d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:49:25 +00:00
Dan Sandler
2cbeed2f3e am 1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '1fb5198732d627baf39492651364c32848abc1f0':
  Show a better list of apps.
2014-09-11 12:06:52 +00:00
Dan Sandler
1fb5198732 Merge "Show a better list of apps." into lmp-dev 2014-09-11 11:58:55 +00:00
Zoltan Szatmary-Ban
7011866262 am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
  Check for DeviceAdminInfo type before casting
2014-09-11 11:00:28 +00:00
Zoltan Szatmary-Ban
cf911d107a Merge "Check for DeviceAdminInfo type before casting" into lmp-dev 2014-09-11 10:52:57 +00:00
Zoltan Szatmary-Ban
12b90be92b am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
  Fixing Trusted Credentials Settings crash
2014-09-11 09:34:24 +00:00
Zoltan Szatmary-Ban
f572fdd132 Merge "Fixing Trusted Credentials Settings crash" into lmp-dev 2014-09-11 09:23:55 +00:00
Vinit Deshpande
8a7cd97457 Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
This change removes requirement that sender has this permission for
protected broadcasts (since they can only come from framework)

Bug: 17409667

Change-Id: I3431c20a4ed28b3ba2bfc3cf53772e63a3424a2c
2014-09-10 18:38:26 -07:00