Commit Graph

4498 Commits

Author SHA1 Message Date
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
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
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
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
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
Jason parks
4548cdf3a9 Check to see if the power source is a valid charger.
This will allow for devices that can be powered
over USB to be encrypted while plugged into USB.

Bug: 4901080
Change-Id: I7eaa2146c1c4e4dfc9724b11a08ff13a16eda117
2011-06-24 14:06:03 -05:00
Dianne Hackborn
127757637b Merge "Add "large text" accessibility option." 2011-06-24 10:47:47 -07:00
The Android Open Source Project
b60a316279 Reconcile with gingerbread-release
Change-Id: I5c53acce972848ec4adb67782e9e741b3555654b
2011-06-24 08:08:51 -07:00
Jeff Sharkey
f54f435f1f More data usage chart iteration, app details.
Moved app details back into single Fragment to support animations and
template tabs.  Show the network in background behind app details
chart series to match designs.

Clamping sweeps at axis boundaries.

Bug: 4813014, 4598460, 4818029
Change-Id: I72c0b21ee1d595e4da31d293ae0dab9e801041f3
2011-06-23 22:30:05 -07:00
Jeff Sharkey
255e71eb53 Resize data usage assets.
Change-Id: If133332b9fd25698fcd94a67bc357052ca19e3c3
2011-06-23 17:42:41 -07:00
Dianne Hackborn
13bac39d21 Remove obsolete compat mode UI.
Change-Id: Ie16f70af4b8d6f33db21363a478049659669e0b3
2011-06-23 17:04:06 -07:00
Dianne Hackborn
00453157ae Add "large text" accessibility option.
Also re-arrange the UI a bit to clearly put the button for
enabling/disabiling accessibility services along-side said
services.

Change-Id: Ica1ddecddf6e97800909ba6bea9ce4e124b59c01
2011-06-23 16:36:43 -07:00
Justin Ho
1ad08445d3 Merge "Turn off hardware acceleration to avoid crashes due to driver." 2011-06-23 15:27:10 -07:00
Amith Yamasani
ac48d0281f Turn off hardware acceleration to avoid crashes due to driver.
TODO: Turn this back on when driver bug is fixed.

Bug: 4883047
Change-Id: I8efb6d77035595650fff8acb8ddbd95a93fc711c
2011-06-23 15:24:06 -07:00
Gilles Debunne
2c12ed9e4b Merge "Refactoring in Settings/Applications" 2011-06-23 12:57:17 -07:00
Gilles Debunne
f52f509446 Merge "Bug 4879032: NPE fix when restarting Settings." 2011-06-23 10:47:15 -07:00
Jaikumar Ganesh
062b54834f am 45679d94: (-s ours) am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '45679d942fa47b947b4ce7b45b82998b2972928d':
  DO NOT MERGE Show user dialog for BT.
2011-06-23 07:48:24 -07:00
Jaikumar Ganesh
e3c8d3e88e am 47504c7b: am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit '47504c7b93823a7e5a0e0b4d9b0ca8f5093f79f9':
  Remove CHAR LIMIT from string to fix build.
2011-06-23 07:40:38 -07:00
Jeff Sharkey
52c3f4461b Iterate on data usage chart UI.
Switched to inflating chart views from XML, using attributes for
configuration.  Start using drawable assets for chart components
instead of manually painting.  Include hand-cut assets, and animate
between states when touched to invoke.

Clamp sweeps to valid chart ranges and prepare for sweep labels.

Bug: 4768483, 4598460
Change-Id: Ic660c35bec826eb5e3f6a1dde3cc04d8c437ef2b
2011-06-23 00:39:47 -07:00
Adam Powell
aef3981e86 Merge "Fix build." 2011-06-22 21:11:01 -07:00
Adam Powell
382b8be088 Fix build.
Change-Id: I766022f4b4224253bd6bc54427b8b2dd482685e1
2011-06-22 21:09:31 -07:00
Kenny Root
811d5c154e Merge "Change dummy calendar setting during locale change" 2011-06-22 20:55:58 -07:00
Jaikumar Ganesh
50edbbbc09 am 87c04ba6: am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '87c04ba668ed856ec61326e90c1fade980d4e893':
  New strings for Bluetooth
2011-06-22 20:31:14 -07:00
Gilles Debunne
b396c9b8c0 Bug 4879032: NPE fix when restarting Settings.
Change-Id: I65b9fb220bf51357c02555902cdb263df7db1016
2011-06-22 17:24:18 -07:00
Gilles Debunne
2c88a877f8 Refactoring in Settings/Applications
Battery, Development moved to main menu.
Unknown sources moved to Security.
Main menu links directly to ManageApplications.
ApplicationSettings was kept in case an other app referenced it.

Change-Id: I0271d4222cfc192f9235f21e06bf3b56f77db1a4
2011-06-22 11:20:48 -07:00