Commit Graph

2771 Commits

Author SHA1 Message Date
Dianne Hackborn
0c2857d48b Merge "Re-enable user disabling of apps." 2011-06-17 14:53:44 -07:00
Dianne Hackborn
a12c1e3226 Re-enable user disabling of apps.
Change-Id: I5f3a474926cf2b93e311435f67f36837f5f56caa
2011-06-17 14:50:11 -07:00
Jeff Sharkey
1a3e41d629 Refactor network policy: paid to metered.
Also bind policy checkbox correctly.

Bug: 4691427
Change-Id: Ib05b39c391bf59582106afff5599d62a04c3c75b
2011-06-17 13:39:33 -07:00
Amith Yamasani
9a2442711e Merge "Wallpaper settings" 2011-06-16 17:49:37 -07:00
Amith Yamasani
fcbf7cffb6 Wallpaper settings
Added an option in Screen settings to choose a wallpaper.
It then shows a list of wallpaper sources and launches the
corresponding intent on selecting.

Bug: 4691375
Change-Id: I9de9edf56ae4cdd5145a1c5d836df66b893a05fe
2011-06-16 17:48:40 -07:00
John Reck
edaa5a286d Merge "SeekBarPreference -> SeekBarDialogPreference" 2011-06-16 13:21:50 -07:00
Narayan Kamath
fb52613a57 Merge "Text to speech settings UI change." 2011-06-16 07:40:29 -07:00
Narayan Kamath
d5642f7060 Text to speech settings UI change.
No more separate checkboxes for each of the engines. This brings
it more in line with the voice recognition settings. The user is
shown a data warning every time he chooses a non system engine
as the default.

Change-Id: I00fcb9c9f634a9fc13ff14da8bfade79ae6727c4
2011-06-16 13:35:34 +01:00
John Reck
c2ad2e4ce5 SeekBarPreference -> SeekBarDialogPreference
Change-Id: Ie1fba2633806a50b5282728dce447be2162ad67f
2011-06-15 16:49:16 -07:00
Jeff Sharkey
dd6efe17e0 Handle data warning/limit notification actions.
Respond to user interaction with data warning/limit notifications
shown by NetworkPolicyManager.  Show correct tab for the template that
triggered notification.  When data is disabled, prompt user with
dialog and option to re-enable.

Change-Id: I73aeecc0e840fffa2b4cdb90af269115ed0ab56c
2011-06-15 10:31:49 -07:00
Jeff Sharkey
aa5260e40a Load app usage on background thread.
Since stats service loads as needed, this may touch disk, and should
run on background thread.

Change-Id: I1d1d2583250314efa4d3d8f4faa9016c746c29d0
2011-06-14 23:28:03 -07:00
Jeff Sharkey
8e911d7b1a Data usage app labels, protect system, hide empty.
Derive better labels from PackageManager, including for sharedUid
case.  Disable "App settings" button when no ResolveInfo found, and
hide "Restrict" checkbox for system UIDs.  Also hide apps with 0
bytes usage.

Change-Id: I4b0a66f6912c02c56bfcbcb5b46f3ae2ba0df504
2011-06-14 22:45:58 -07:00
Amith Yamasani
5a259aae18 am 80cc0ffa: am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '80cc0ffa2b284aee595c45f8f4142f615486f797':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 20:56:45 -07:00
Jeff Sharkey
980385b3f9 Merge "Cycle day editor and other confirmation dialogs." 2011-06-14 16:35:51 -07:00
Jeff Sharkey
4c72ae5e3d Cycle day editor and other confirmation dialogs.
Create dialog to edit "cycle day" when data usage resets.  Also added
dialogs to confirm enabling limit and restricting an application.

Change-Id: I1e08b17fabd1fcfc2f260807a61435d0ff1a8627
2011-06-14 16:32:06 -07:00
Amith Yamasani
80cc0ffa2b am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit 'e7f7643c485ed6926bc354ca28628d5179019b50':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:44:23 -07:00
Amith Yamasani
e7f7643c48 am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
2011-06-14 15:41:00 -07:00
Amith Yamasani
6ef6f183e4 Stability fixes for Settings. Asynchronous callbacks causing NPEs.
Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
2011-06-14 15:19:14 -07:00
Narayan Kamath
62f153dbde Fix a bug in the TTS settings.
Non system engines that are explicitly enabled should
show up in the "default engine" dropdown list.

bug:4608012

Change-Id: Ic805ef6199319e44037a84ba43fc549de91d291d
2011-06-14 16:40:00 +01:00
Jeff Sharkey
94a9095eac Read network policy earlier, fix ugly scrollbar.
Read policy before creating options menu, so we correctly populate
checkboxes.  Also clean up Preference views so we don't crash when
returning from app details.

Change-Id: I52c38a3016ea669e27b325bfb6ae1620d2a5ca53
2011-06-13 22:31:09 -07:00
Jason parks
00046d6e17 Get encryption working for phones.
I've removed the "special" keyboard from the phone
layouts for now.

Change-Id: I4b18279dafb18ba7cebacfad1b7167e34a7203b4
2011-06-13 17:39:25 -05:00
Mike Lockwood
6fc9c2fd37 am c938a02b: am c1db1192: am d2a6f28f: Disable option to format SD card for secondary external storage
* commit 'c938a02bc69434840340dcebb8ac16b6dcfb8b60':
  Disable option to format SD card for secondary external storage
2011-06-13 04:46:53 -07:00
Mike Lockwood
c938a02bc6 am c1db1192: am d2a6f28f: Disable option to format SD card for secondary external storage
* commit 'c1db119250fd481341c095f47a62adb14ad09484':
  Disable option to format SD card for secondary external storage
2011-06-13 04:36:26 -07:00
Mike Lockwood
c1db119250 am d2a6f28f: Disable option to format SD card for secondary external storage
* commit 'd2a6f28fa7ba8189d2a1987129db27fd840fac0f':
  Disable option to format SD card for secondary external storage
2011-06-13 04:25:51 -07:00
Jeff Sharkey
4dfa66001d First pass at detailed app data usage, policy.
Fragment to show application data usage details, including chart with
inspection ranges.  Button that invokes ACTION_MANAGE_NETWORK_USAGE
towards application, and UID-specific policy controls.  Fragment is
launched when clicking list items from data usage summary page.

Change-Id: Ie1564aa8af98e1a7083817a997059a5a7b1caa50
2011-06-13 00:42:22 -07:00
Jeff Sharkey
05cc0cc4a6 Modifier to combine/split mobile network policy.
Create NetworkPolicyModifier which knows about which mobile network
policies can coexist.  Settings UI uses this modifier to drive UI and
persist policies.

Change-Id: Ib3f3841b0a74c14eefb99209dd644a2e7b7e525d
2011-06-12 23:11:40 -07:00
Kenny Root
151b0e1174 Change dummy calendar setting during locale change
If the timezone changed too far, the example date would be "1/1/yyyy+1"
instead of "12/31/yyyy"

Move the setting of the Calendar time to where the string is calculated
to make sure we have the most up-to-date Locale.

Bug: 4596841
Change-Id: I67a253a65b1ea03ee717945c5df819beb8515662
2011-06-12 20:54:53 -07:00
Mike Lockwood
d2a6f28fa7 Disable option to format SD card for secondary external storage
This is a temporary workaround for an interoperability problem with MTP

Change-Id: Iaf63ea0ac76e12ffd635765785da027cab0fcb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-11 18:11:03 -04:00
Jeff Sharkey
8a50364a71 Iterating on data usage; tabs, scrolling, cycles.
Added ActionBar items to control complexity of data surfaced; checked
state causes tabs to be shown/hidden for "Mobile", "2G-3G", "4G", and
"Wi-Fi" network templates.  Loading historical stats and policy from
system services based on selected tab.

Change entire body under tabs to scroll, treating network options and
chart as ListView headers.  Teach chart sweep to disable intercept to
play with ListView, and draw sweep disabled as dashed line.  Hijacking
Preference views for toggles to offer consistency.  No policy updates
are persisted yet.

Based on available historical network stats and policy cycle reset day,
build list of user-selectable cycles.  Wired up chart to display cycle
data and reset inspection region to last week of available data.

Change-Id: Ia561578276fa23908b745fbc06a6ef828d9ccc2e
2011-06-10 16:17:21 -07:00
Freeman Ng
86432504d3 am 945aac2e: am fb096074: am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '945aac2e299e8a290c6ec3e5fbad84b7c28366ce':
  remove disabling of Back/Dismiss button for 10" mode
2011-06-10 14:08:35 -07:00
Narayan Kamath
3dbba08455 Clean up some of the TTS settings code.
(a) No longer use a hardcoded default.
(b) With this change, the system engine with the highest
declared priority becomes the default.

Change-Id: I20c6036b855f008b6a83f1dac81aefc07e3ca7f3
2011-06-10 16:51:50 +01:00
Freeman Ng
945aac2e29 am fb096074: am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit 'fb09607469a5cb42c833725d121e517af5daca72':
  remove disabling of Back/Dismiss button for 10" mode
2011-06-10 07:46:40 -07:00
Freeman Ng
fb09607469 am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '148222fd43499a578c16c0bdf6ae9336255facd7':
  remove disabling of Back/Dismiss button for 10" mode
2011-06-09 18:22:02 -07:00
Freeman Ng
03708e030a remove disabling of Back/Dismiss button for 10" mode
bug: 4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
2011-06-09 16:00:34 -07:00
Jeff Sharkey
fc8873a208 Merge "Checkpoint of data usage UI, graphs and lists." 2011-06-09 11:22:14 -07:00
Joe Onorato
8682f3b74b Merge "Remove this setting that never really got finished." 2011-06-09 09:44:56 -07:00
Joe Onorato
aa0e48f939 Remove this setting that never really got finished.
Change-Id: Id52d7e4f735a2a289533fc9d8461f70218601764
2011-06-09 09:44:30 -07:00
Jeff Sharkey
ab2d8d3a38 Checkpoint of data usage UI, graphs and lists.
Chart of network usage over time, with draggable "sweep" bars for
inspection region and warning/limits.  Talks with NetworkStatsService
for live data, and updates list of application usage as inspection
region changes.

Change-Id: I2a406e6776daf7d74143c07ec683c10fe711c277
2011-06-09 09:26:30 -07:00
Irfan Sheriff
32232fd9f2 am 4a1b8898: am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
  Fix UI settings display issues
2011-06-08 17:32:04 -07:00
Freeman Ng
1bc2f0c995 Merge "fix breakage caused by recent automerge" 2011-06-08 14:35:18 -07:00
Freeman Ng
4412e88e83 fix breakage caused by recent automerge
Change-Id: Ifb4c8428f5ebc728146da848cb0319626854c667
2011-06-08 14:34:23 -07:00
Freeman Ng
3a5764a4bf resolved conflicts for merge of ab48c22e to master
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
2011-06-08 13:33:42 -07:00
satok
2e2eb63ff6 Merge "Use getDisplayName for the name of InputMethodSubtype" 2011-06-08 04:09:14 -07:00
satok
f0ae329740 Use getDisplayName for the name of InputMethodSubtype
Change-Id: I9ad7790bc36ff2950e0238cae8ce3b785bb8eaa1
2011-06-08 18:44:52 +09:00
Freeman Ng
0a24ca3b18 am 6beb924e: am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '6beb924ec2b147d259cd3438f56cd88691fc57e5':
  add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 18:20:19 -07:00
Gilles Debunne
94129ad9a2 am 62634b30: am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shown
* commit '62634b309ab6c352a37c4d79d50fc78ab806304f':
  Bug 4539424: confirmation dialog always shown
2011-06-07 17:17:56 -07:00
Irfan Sheriff
4a1b8898c7 am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit 'f448c32d9b4718e657fd4811f43d8df0f9d921af':
  Fix UI settings display issues
2011-06-07 13:58:28 -07:00
Irfan Sheriff
f448c32d9b Merge "Fix UI settings display issues" into honeycomb-LTE 2011-06-07 13:54:53 -07:00
Freeman Ng
ab48c22e7d am c47e9a1d: am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
* commit 'c47e9a1d65dad04f778973b2898acf96c48b8914':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
2011-06-07 13:16:13 -07:00
Freeman Ng
c47e9a1d65 am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
* commit '0fd7736b7153c1a304d7c6098ecf1223052f56d5':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
2011-06-07 12:58:06 -07:00