Commit Graph

5495 Commits

Author SHA1 Message Date
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
David Christie
587e6bf3fc Update power widget icons and fix location behavior
Bug: 11242129

Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
2013-11-07 11:20:35 -08:00
Robert Greenwalt
6c20565d97 am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '384bf72708b623bf48a0395a51db94bda055f496':
  Add batch scan data to power stats.
2013-11-07 10:43:11 -08:00
Robert Greenwalt
29b7a8446a Merge "Add batch scan data to power stats." into klp-dev 2013-11-07 18:31:03 +00:00
Kenny Root
856c998aab am d0e1c273: am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit 'd0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
  Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:17:49 -08:00
Kenny Root
d0e1c273db am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '279c1e15d23254728783ad99faff7349d9543ac4':
  Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:14:35 -08:00
Kenny Root
d0de39e716 Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 2013-11-06 23:09:06 +00:00
Kenny Root
b974fa8034 Revert "Accessibility: filter touches to Enable button"
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
2013-11-06 22:03:52 +00:00
Lifu Tang
9ec08d65c5 am 227043b5: am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '227043b55722b38cde8508011e2b1748e5ef66bc':
  Shows LGAAYL when launching Location Settings
2013-11-06 08:51:56 -08:00
Lifu Tang
227043b557 am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
  Shows LGAAYL when launching Location Settings
2013-11-05 22:26:19 -08:00
Lifu Tang
741bc05424 Merge "Shows LGAAYL when launching Location Settings" into klp-dev 2013-11-06 06:20:56 +00:00
Jason Monk
492c8ef15e am 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
  Add PAC UI to Wi-Fi Settings
2013-11-05 18:59:11 -08:00
Jason Monk
58f53f9c35 am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
  Add PAC UI to Wi-Fi Settings
2013-11-05 18:56:49 -08:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Elliott Hughes
78ab4a51e9 am c26cdd10: am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
* commit 'c26cdd10cfc1e6d209f57247f8ba3fc24ca2f546':
  Move a line into try block
2013-11-05 13:00:58 -08:00