Commit Graph

2636 Commits

Author SHA1 Message Date
Jeff Sharkey
8083eaffbe am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1
* commit '4b94e073854b72205f12ff268211a51d634fbc8f':
  Data usage label width, locking, Wi-Fi fixes.
2011-11-11 11:49:54 -08:00
Jeff Sharkey
4b94e07385 Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 2011-11-10 18:10:34 -08:00
Jeff Sharkey
bdf98e84ab Data usage label width, locking, Wi-Fi fixes.
Avoid wrapping sweep labels when underlying string is long, and avoid
showing blank "^1" sweep labels.  Only offer "restrict data" when
mobile networks are present.  Add locking around UidDetailProvider.

Move to isNetworkSupported() for consistency.

Bug: 5492495, 5471602, 5439402, 5373465
Change-Id: I79f5938d45ffbb4c2c242106424a466042a26c1c
2011-11-10 17:17:24 -08:00
Amith Yamasani
cebc56b606 am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1
* commit '6519c610353cdb9ed670913058a1732cf79d6186':
  Potential fix for monkey crash.
2011-11-10 21:12:04 +00:00
Amith Yamasani
6519c61035 Merge "Potential fix for monkey crash." into ics-mr1 2011-11-10 13:09:54 -08:00
Amith Yamasani
1af528b1ab am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1
* commit '2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
  Remove system tutorial option in Settings->About.
2011-11-09 18:59:13 +00:00
Jeff Brown
48c1d78c2f am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit '81dfecf8ba6a603fd8974640517966c3a8930be3':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 18:58:59 +00:00
Amith Yamasani
a10af7c23a am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1
* commit '2eb32b00775b6e308e1c422856c1046c6c33b54a':
  Prevent orphaned fragment on the settings stack.
2011-11-09 14:36:54 +00:00
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00
Amith Yamasani
39dd54bee0 Potential fix for monkey crash.
The tab was being changed by a "keypress" after the fragment was
destroyed. Disable the widget until a resume.

Bug: 5157399
Change-Id: Ic1515255052eaea01f71c133d8570f25d65351b2
2011-11-08 15:22:09 -08:00
Jeff Brown
b8dd637887 Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug: 5569662

Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
2011-11-08 14:32:29 -08:00
Amith Yamasani
75a51aa6d2 Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove
the code permanently, since we don't support the system tutorial flow
anymore.

Bug: 5425836
Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482
2011-11-08 11:08:28 -08:00
Amith Yamasani
2eb32b0077 Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 2011-11-08 10:46:46 -08:00
Danielle Millett
498116df1d am 179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1
* commit '179b32869c4476a30b0c933fb73a1a8e258ce11c':
  Adding an improve face matching settings option for Face Unlock
2011-11-08 18:28:19 +00:00
Jason Simmons
f75335564e resolved conflicts for merge of 322da591 to ics-aah
Change-Id: I4cd3301cf448761b2585c16f83787f6f2c9007b9
2011-11-08 10:23:15 -08:00
Danielle Millett
179b32869c Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 2011-11-08 10:03:17 -08:00
Robert Greenwalt
322da59174 Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 2011-11-08 10:01:30 -08:00
tk.mun
7c5c16565e Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:16:18 -08:00
Amith Yamasani
5ba0a0295f Prevent orphaned fragment on the settings stack.
Remove the AppDetailsFragment from the stack if DataUsage is being destroyed.

Bug: 5572241
Change-Id: Ifb2c9233bf75c8cc7b43eec5ea3f0c0b0ba65ffe
2011-11-07 15:20:39 -08:00
Danielle Millett
487b16f340 Adding an improve face matching settings option for Face Unlock
Adding an option which will launch a version of setup where faces
can be added to the current gallery.  It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
2011-11-07 17:29:22 -05:00
Narayan Kamath
76afb65d3e am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1
* commit '8214d201db04c27ed82265ec46f85a87f1adf179':
  Fix two bug in the TTS settings.
2011-11-07 10:27:53 +00:00
Narayan Kamath
8214d201db Merge "Fix two bug in the TTS settings." into ics-mr1 2011-11-07 02:26:29 -08:00
Steven Ross
68953fba71 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1
* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287
2011-11-05 00:39:35 +00:00
Steven Ross
9c4f31c119 Merge "Using same task fixes 5486287" into ics-mr1 2011-11-04 17:38:11 -07:00
Irfan Sheriff
27dda6637c am 815c7a04: am 01b32368: Add provisioning checks for BT and USB
* commit '815c7a042d58a3e21f71603bfb972a31a79addca':
  Add provisioning checks for BT and USB
2011-11-04 22:49:53 +00:00
Irfan Sheriff
815c7a042d am 01b32368: Add provisioning checks for BT and USB
* commit '01b32368fffd944a0265f22db764b689179be94c':
  Add provisioning checks for BT and USB
2011-11-04 22:48:39 +00:00
Irfan Sheriff
01b32368ff Add provisioning checks for BT and USB
Bug: 5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
2011-11-04 15:12:13 -07:00
Narayan Kamath
fdd94d87de Fix two bug in the TTS settings.
(a) The TTS API doesn't mandate that unavailable voices should
be set and null, so deal with it correctly.

(b) The android manifest contained a reference to the old
TTS class.

bug:5525023
Change-Id: I1c16dbc75893288e5fa221c73a7284fca7ab25c5
2011-11-04 16:48:20 +00:00
Steven Ross
1999577979 Using same task fixes 5486287
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
2011-11-04 10:28:32 -04:00
Daniel Sandler
f11106e1a9 am f53c3602: Bring back Android Dreams.
* commit 'f53c3602f92d623f03e941c1d590a4720578cf5e':
  Bring back Android Dreams.
2011-11-03 10:58:31 +00:00
Daniel Sandler
f53c3602f9 Bring back Android Dreams.
Bug: 5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
2011-11-02 23:30:27 -04:00
Irfan Sheriff
8f246e1803 am 1484531a: am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '1484531ad99d14744fea3de8a239905a404a0c2f':
  Use component details to send provisionig intent
2011-11-02 04:20:48 +00:00
Irfan Sheriff
1484531ad9 am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0
* commit '1103c3beb80c522778ae7b925d703e2ac3afd5e3':
  Use component details to send provisionig intent
2011-11-02 04:18:13 +00:00
Irfan Sheriff
1103c3beb8 Merge "Use component details to send provisionig intent" into ics-mr0 2011-11-01 21:15:30 -07:00
Irfan Sheriff
642a3c78f8 Use component details to send provisionig intent
Bug: 5544654
Change-Id: I0bd33c2a0d4c657bd10ba966d67ff54c27e42ea1
2011-11-01 14:58:31 -07:00
Irfan Sheriff
2f0105109d am df8c7aa2: am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0
* commit 'df8c7aa25f3efaeaeac180f4d8c1d6b132d14924':
  Fix WPS pin input UI
2011-10-31 21:05:26 +00:00
Irfan Sheriff
df8c7aa25f am 19d9a3d2: Merge "Fix WPS pin input UI" into ics-mr0
* commit '19d9a3d2846c538502003a81522f6d285b9ff24b':
  Fix WPS pin input UI
2011-10-31 21:03:19 +00:00
Irfan Sheriff
19d9a3d284 Merge "Fix WPS pin input UI" into ics-mr0 2011-10-31 14:01:42 -07:00
Irfan Sheriff
b9dfea636f Fix WPS pin input UI
Change If60f42f7 introduces a bug for the WPS UI.

The input from access point text box should be shown for KEYPAD input

Bug: 5542833
Change-Id: I27f758b31b69425f51fe7ed17bf9b787a1bf66cc
2011-10-31 13:39:14 -07:00
Ed Heyl
a762e1d708 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:48 -07:00
Amith Yamasani
8fd5e45052 am 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0
* commit '480b2e440646e4859ebdd88b82441b4bd9a61651':
  Use vibrate icon in volume settings when appropriate.
2011-10-30 21:37:12 +00:00
Amith Yamasani
ca7205842a Use vibrate icon in volume settings when appropriate.
Clicking on icon will now put it in vibrate mode (instead of silent)
if vibrate is enabled for silent mode.

Bug: 5530217
Change-Id: Icd314981734af2cb37cf47fe27fc697bf447af73
2011-10-28 19:22:05 -07:00
Narayan Kamath
15dc52f9e9 Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1 2011-10-28 02:15:38 -07:00
Jaikumar Ganesh
c89fa2fbfb am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
* commit 'd9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
  Fix UI issue with Bluetooth Settings.
2011-10-28 02:14:06 +00:00
Jaikumar Ganesh
f5754a078c Fix UI issue with Bluetooth Settings.
When a profile fails to connect, the preference was getting unset.

Patch generated in conversation with Jake Hamby.

Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
2011-10-27 16:39:50 -07:00
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-27 17:39:54 -04:00
Narayan Kamath
687e22bcf9 Hide the "install voice data" preference by default. DO NOT MERGE
Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.

bug:5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d
2011-10-27 17:15:51 +01:00
Todd Poynor
296f2d270f am a94320e3: Settings use minimum manual brightness from config
* commit 'a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
  Settings use minimum manual brightness from config
2011-10-26 12:22:41 +00:00
Todd Poynor
a94320e332 Settings use minimum manual brightness from config
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.

Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2011-10-25 17:14:33 -07:00
Irfan Sheriff
cd5b0233bb am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing
2011-10-21 14:38:39 -07:00