Commit Graph

5300 Commits

Author SHA1 Message Date
Alan Viverette
17bf9338f6 Merge "Update A11y service dialog for explicit create() before getButton()" 2013-12-17 01:20:41 +00:00
Andres Morales
73fed2c477 Merge "fix npe in SecuritySettings" 2013-12-16 19:27:30 +00:00
Andres Morales
5786e5f471 fix npe in SecuritySettings
Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
2013-12-16 11:23:14 -08:00
Kenny Root
2d8e25af35 am 3bf6ac0c: am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '3bf6ac0c0ea1fe05f925d8df3db2e35f674dce4a':
  Use java.util.Objects instead of internal API
2013-12-13 22:57:33 +00:00
Kenny Root
ef2f97c70e am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
  Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
7440dde808 Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00
Alan Viverette
72cb46f1b7 Update A11y service dialog for explicit create() before getButton()
Change-Id: Ic0fb7e2e7985dd3d3b65e40a639ab5fc0f5a8fd5
2013-12-11 16:07:00 -08:00
Vinit Deshapnde
c621418d3d Move Wifi/P2p service components under services
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.

Similar issue exists with WifiEnterpriseConfig constants.

Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
2013-12-11 16:05:46 -08:00
Alan Viverette
22b70376ed Merge "Accessibility: filter touches to Enable button" 2013-12-10 21:58:45 +00:00
Alan Viverette
24ef59737b Remove dialog offering to download TalkBack
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.

BUG: 10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
2013-12-10 13:19:13 -08:00
Alan Viverette
96118a4d53 Accessibility: filter touches to Enable button
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.

Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-12-09 19:08:36 -08:00
Andres Morales
fd2b629335 Settings for NFC Unlock
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
2013-12-06 13:50:26 -08:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Alan Viverette
205cee4c1c Add preference for caption text opacity
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2013-12-05 11:27:40 -08:00
Alan Viverette
3858233f89 Merge "Remove extra fragment in captioning preferences" 2013-12-05 01:19:54 +00:00
Alan Viverette
4098dba253 Remove extra fragment in captioning preferences
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2013-12-04 17:19:24 -08:00
Amith Yamasani
eba89f4fae am 5ae0b304: am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"
* commit '5ae0b304a9cda254239c5fdfd12a744bda191e2c':
  Fix switching running/cached apps with memory bar
2013-12-04 21:14:44 +00:00
Amith Yamasani
ff0fad2a06 am e10f8528: Merge "Fix switching running/cached apps with memory bar"
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
  Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
e10f852822 Merge "Fix switching running/cached apps with memory bar" 2013-12-04 19:17:33 +00:00
Amith Yamasani
38bfb392c7 am e6e80b19: am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit 'e6e80b195b011c074241cbae4325f713190fa196':
  Put fragment in specific activity's whitelist
2013-12-03 19:45:49 +00:00
Amith Yamasani
ab747c87a9 am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
  Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Lorenzo Colitti
5613086bdb am 540d26e8: Merge "Dynamically update connectivity and IP address."
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
  Dynamically update connectivity and IP address.
2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab am 20ab234f: Merge "Cache preferences and services in status dialog."
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
  Cache preferences and services in status dialog.
2013-11-26 08:38:49 -08:00
Amith Yamasani
a88bdd34f7 Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
2013-11-25 11:10:00 -08:00
Lorenzo Colitti
5448b25481 Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

[Cherry-pick of deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7 Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

[Cherry-pick of 6eb6a90821]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-25 17:34:08 +09:00
William Luh
64e676a586 Add event logging for device admin.
This allows us to gather metrics about unwanted device admin apps. User consent from Verify Apps is required.

Bug: 11253927
Change-Id: I449929772f63f426426f7726d3d21e7c1512e6ce
2013-11-22 15:45:33 -08:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Jeff Brown
8dd9b71f7c am 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display.
* commit '169e8a0c2aee26731a847a46954d95a78161ecd8':
  Add help url for remote display.
2013-11-18 19:13:24 -08:00
Jeff Brown
169e8a0c2a am 017d2a18: am 130118d4: Add help url for remote display.
* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.
2013-11-18 19:09:55 -08:00
Jeff Brown
130118d436 Add help url for remote display.
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
2013-11-18 17:58:08 -08:00
Svetoslav
7662c1f21f am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '03360cd23910c73c78a822c559acb3eb66a8e07b':
  Show correct message for a print job that is being canceled.
2013-11-14 22:34:13 -08:00
Svetoslav
03360cd239 am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
  Show correct message for a print job that is being canceled.
2013-11-14 22:30:53 -08:00
Svetoslav
e7b781f574 Merge "Show correct message for a print job that is being canceled." into klp-dev 2013-11-15 06:23:54 +00:00
Lorenzo Colitti
35684faff1 Merge "Dynamically update connectivity and IP address." 2013-11-15 05:09:48 +00:00
Lorenzo Colitti
04234ecfba Merge "Cache preferences and services in status dialog." 2013-11-15 05:07:00 +00:00
Svetoslav
97e962cd36 Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
   message that matches what the notification shows.

2. If a print job is being canceled we do not show the cancel
   button.

bug:11696928

Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Jim Miller
a7e2abb530 am f75a736a: am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit 'f75a736a3e19385d7635a1c8b5f25f70d3b08dbc':
  Don't show keyguard on top of CryptKeeper
2013-11-14 16:33:12 -08:00
Jim Miller
f75a736a3e am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
  Don't show keyguard on top of CryptKeeper
2013-11-14 16:29:39 -08:00
Jim Miller
fb3d5cad48 Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.

CryptKeeper itself should explicitly dismiss keyguard.

Fixes bug 11680832

Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -08:00
David Christie
f420843a44 am 9605791d: am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
* commit '9605791d4165435330979497191a6ac902762271':
  Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:25:09 -08:00
David Christie
9605791d41 am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
  Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:20:31 -08:00
David Christie
b1ded62f3f Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev 2013-11-14 20:12:42 +00:00
Lorenzo Colitti
deb8f08ace Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-15 02:38:36 +09:00
Lorenzo Colitti
6eb6a90821 Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-15 02:38:35 +09:00
Jeff Brown
71504b1f71 am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 20:51:05 -08:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -08:00
Robert Greenwalt
3bdc1eb38a am 6c20565d: am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '6c20565d97339751f22123a4b40893f2df7ea3ad':
  Add batch scan data to power stats.
2013-11-07 15:12:58 -08:00