Commit Graph

5071 Commits

Author SHA1 Message Date
satok
3fa13775e8 Implement new UI for IME settings
Bug: 4645160

Change-Id: If9046e7e96732f6ee4c0594cc66622b6462bdec9
2011-06-30 20:13:29 +09:00
Matthew Xie
dbed12020c Show user dialog for BT connection and phonebook access
Show user dialog for incoming BT connection requests from unknown
devices. Move phone book access permission dialog from bluetooth to settings.
The permision dialog pops up to the screen properly instead of
always as notification. AT+CPBR will also use the permission dialog
to ask for user permission.

bug 4489572

Change-Id: Ic1e74b2a9416a462cac4f519240a313691da90c4
2011-06-29 23:33:26 -07:00
Dianne Hackborn
29865fed4d Merge "Fix up storage UI for old USB storage." 2011-06-29 17:37:47 -07:00
Amith Yamasani
38898b63f0 Merge "Add PowerUsageSummary to proguard list." 2011-06-29 17:31:49 -07:00
Amith Yamasani
1909901875 Add PowerUsageSummary to proguard list.
Bug: 4975279
Change-Id: I8e36dd6ce6f0e6a7859af00e7980e636933140fb
2011-06-29 17:24:14 -07:00
Gilles Debunne
c98357a4b4 Merge "Double list in Bluetooth Settings" 2011-06-29 15:59:21 -07:00
Dianne Hackborn
bd9ddab4f4 Fix up storage UI for old USB storage.
- In the storage overview, if storage is not emulated then we have a
new first section showing internal storage.
- In manage applications, we know show storage use on the SD card
separately from internal storage use.

Change-Id: I7eb993f59fdb5de5f5dcfe4a3bc2b95ae30d754a
2011-06-29 15:41:28 -07:00
Chia-chi Yeh
2df5970197 Merge "VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs." 2011-06-29 15:33:58 -07:00
Chia-chi Yeh
bbb5094be6 VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.
Change-Id: Ia58afa2f6f6d4b1b208bf6b893b8b7712154bdbf
2011-06-29 15:29:28 -07:00
The Android Automerger
2e95ba0f24 merge in ics-release history after reset to master 2011-06-29 06:46:29 -07:00
Brian Carlstrom
d1669eac43 Merge "Follow naming conventions of proguard.flags" 2011-06-28 20:05:46 -07:00
Brian Carlstrom
ac45fb42b0 Follow naming conventions of proguard.flags
Change-Id: Idbd136fb25447aa1f6629d8caa17b87924ed3936
2011-06-28 19:57:14 -07:00
Gilles Debunne
4346cda76c Double list in Bluetooth Settings
Paired devices are listed first (from cache), followed by unpaired ones.
A scan is only started on user request or when there is no paired device
(should it be when there is no paired *connected* device?).

Wrench icon only displayed for paired devices.

Wrench click listener no longer uses mDeviceSettings which is unreliable
with ListView view recycling.

Fixed blinking ProgressCategory when the category was first in the list.

Change-Id: Ie749883426c12bd354da64733bd04b00304bc1f5
2011-06-28 18:17:30 -07:00
Daisuke Miyakawa
fe0be7fcbf Remove call settings menu
It will be shown in Contacts app instead

Bug: 4971637
Change-Id: I081708d4b2cf296d0e37dd20f6ac82f37438d9f0
2011-06-28 16:07:44 -07:00
Jim Miller
d1a22ec0a2 Merge "Fix 4686480: Cleanup LockScreen settings" 2011-06-28 12:58:14 -07:00
Jim Miller
212fc5650a Fix 4686480: Cleanup LockScreen settings
This fix updates the style for buttons to better conform to the screen
by using weightSums.

It also makes layouts much more flexible across platforms by making
better use of the square aspect feature of LockPatternView.

Change-Id: I63677790bf0ac52707c8c356540ecd5dc50ca33b
2011-06-28 12:56:39 -07:00
Gilles Debunne
22559fcac9 Merge "Split ActionBar in Settings" 2011-06-28 11:39:46 -07:00
Gilles Debunne
ced7c03a11 Merge "Bug 4950070: correct title in Settings" 2011-06-28 11:38:42 -07:00
Gilles Debunne
083dd99de5 Merge "Minor changes in Settings" 2011-06-28 11:38:20 -07:00
Jason parks
fadc3974ce Merge "Check to see if the power source is a valid charger." 2011-06-28 09:10:06 -07:00
The Android Automerger
3d067828a7 merge in ics-release history after reset to master 2011-06-28 06:44:33 -07:00
Narayan Kamath
8cb0982982 Fix a bug in the TTS settings.
Send the CheckVoiceData intent to the currently
selected engine.

Change-Id: I63d4b7fc935126a0fe7c5717b2455bcf11135b8b
2011-06-28 09:45:26 +01:00
Isaac Levy
5edab9aa08 Merge "Add WifiWatchdogService toggle to Wifi Settings" 2011-06-27 18:30:19 -07:00
Isaac Levy
a2f301cc66 Add WifiWatchdogService toggle to Wifi Settings
Toggle is located in Settings->Wifi Settings->Advanced Wifi Settings

Change-Id: I0f8f2b6353842dae0b47dca1dd48994e42505169
2011-06-27 18:17:42 -07:00
Gilles Debunne
dc7101ff88 Split ActionBar in Settings
Made menu item visible to force action bar, changed style.

Also change parent_fragment for items that have been moved to top level (wifi,
bluetooth, development, battery).

Change-Id: I62932ba55356abdfbf94942f5b4efaa0f15dbd6a
2011-06-27 17:00:23 -07:00
Eric Fischer
2b74a839e0 am d2157460: am 6a078ed3: (-s ours) am a18484fb: Import new translations.
* commit 'd21574604a3c68487f952a16bc9b2f384dea05cd':
  Import new translations.
2011-06-27 16:43:37 -07:00
Eric Fischer
d21574604a am 6a078ed3: (-s ours) am a18484fb: Import new translations.
* commit '6a078ed3d5808e0951a1e0cb8a47fdf210cf884b':
  Import new translations.
2011-06-27 16:40:59 -07:00
Eric Fischer
6a078ed3d5 am a18484fb: Import new translations.
* commit 'a18484fb3819feac248255d6ce509049330aca1b':
  Import new translations.
2011-06-27 16:37:03 -07:00
Brian Carlstrom
f6f4e303ab CA certificate settings fragment
Change-Id: I8d4b595d6cc8d20be9bea655c7674c86a9183818
2011-06-27 15:16:42 -07:00
Marco Nelissen
3a5079823a Merge "Fix crash in Settings" 2011-06-27 14:58:57 -07:00
Eric Fischer
a18484fb38 Import new translations.
Change-Id: I7b45aed12328a25b81878f29364bcc837c956509
2011-06-27 14:50:05 -07:00
The Android Automerger
5162542304 merge in ics-release history after reset to master 2011-06-27 14:25:13 -07:00
Dianne Hackborn
3937b15bbf am c9a477ae: am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.
* commit 'c9a477aeaccda8a6fec48ee02ef04d5f7285097a':
  Remove obsolete compat mode UI.
2011-06-27 14:15:10 -07:00
Marco Nelissen
5d4b25c9a7 Fix crash in Settings
Change-Id: Idfc3a7e91caa1d8007db0c4bee856cfe0cbd2905
2011-06-27 14:11:26 -07:00
Gilles Debunne
3661b62c99 Bug 4950070: correct title in Settings
isMultiPane does not seem to be adequate for these tests.
It actually may have to be changed...

Change-Id: I23ddca31bb0324c1473f1a7048db3d6271583414
2011-06-27 11:19:19 -07:00
The Android Automerger
26a9532e43 merge in ics-release history after reset to master 2011-06-27 06:51:13 -07:00
Chia-chi Yeh
5754baa58c Merge "Settings: add a new layout for VpnSettings." 2011-06-26 19:46:38 -07:00
Chia-chi Yeh
b02af51b54 Settings: add a new layout for VpnSettings.
Change-Id: I12b89771621e2e1b8ceea6e899e1a27dae6fac08
2011-06-26 19:46:22 -07:00
Chia-chi Yeh
fa001e6868 Merge "Settings: add a new layout for VpnDialog." 2011-06-26 19:40:12 -07:00
Chia-chi Yeh
00527d8c11 Settings: add a new layout for VpnDialog.
Change-Id: Ib9d00dc5f56933db60aa08bce489343b00281e28
2011-06-26 19:39:18 -07:00
Chia-chi Yeh
6320a2699c Merge "Settings: revise VpnSettings." 2011-06-26 19:26:15 -07:00
Chia-chi Yeh
310d619acb Settings: revise VpnSettings.
Make the style closer to other settings.
Profiles are saved in KeyStore with optional account information.
Not adapt to IConnectivityManager yet.

Change-Id: I9d7a0c14b253a0b355499c5e558b0761fa24ea22
2011-06-26 19:25:59 -07:00
Jeff Sharkey
b9dd8e10ee Merge "Fix animation bugs, stop disabled sweep touches." 2011-06-24 23:13:13 -07:00
Jeff Sharkey
2af35fb44d Fix animation bugs, stop disabled sweep touches.
Change sweep drawables to crossfade correctly between states, and
work around 4946591 by nesting container one level deeper.  Also wait
until first layout pass is finished before applying LayoutTransition.

Prevent touches from reaching sweeps when chart is disabled.  Also
bring back log scale for data.

Change-Id: I2194714ab075fd32525681119f30427c1b96fc50
2011-06-24 23:11:51 -07:00
Gilles Debunne
362bd107a1 Minor changes in Settings
Battery moved to main menu.

Change-Id: I0db89c197a1256aaac35ceb95bfa4a567ea6613f
2011-06-24 16:20:35 -07:00
David Brown
8373b45169 Add "emergency call" button to CryptKeeper
This allows you to make an emergency call without needing to decrypt
your device first.

The exact appearance of the button, and the two possible icons shown to
the left of the text, are taken directly from the corresponding
framework resources (see keyguard_screen_*.xml, ic_emergency.png, and
stat_sys_phone_call.png.)

Also, the code in CryptKeeper.java for updating the state of, and
handling clicks from, the "Emergency call" button is mostly duplicated
from the corresponding code in LockPatternUtils and
LockPatternKeyguardView under frameworks/base.

Bug: 4494186
Change-Id: I36a713fdbc3281a7ba46762d47d5b61fb3cd194d
2011-06-24 16:18:30 -07:00
The Android Automerger
988059f8ec merge in ics-release history after reset to master 2011-06-24 14:22:55 -07:00
The Android Automerger
c3bc9aec84 merge in ics-release history after reset to master 2011-06-24 13:30:42 -07:00
Dianne Hackborn
c9a477aeac am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.
* commit 'e3cfa9bc557e92d7a1b01270a405a9bd99700310':
  Remove obsolete compat mode UI.
2011-06-24 12:41:05 -07:00
Dianne Hackborn
e3cfa9bc55 am 13bac39d: Remove obsolete compat mode UI.
* commit '13bac39d2120a82b8a22b52f0db0727aa04b1f38':
  Remove obsolete compat mode UI.
2011-06-24 12:24:21 -07:00