Commit Graph

2428 Commits

Author SHA1 Message Date
Eric Fischer
3c75fbc556 am 5bdc3e91: Import revised Croatian translations.
* commit '5bdc3e9139a7b37b97a56554cc9a89abc196b437':
  Import revised Croatian translations.
2011-06-16 15:48:43 -07:00
Eric Fischer
957bed6e52 am 3bf263c9: am b5c4437f: Import revised translations. DO NOT MERGE
* commit '3bf263c97e23eeec199bd56ef520fba17a1e3917':
  Import revised translations.  DO NOT MERGE
2011-06-16 14:41:45 -07:00
Eric Fischer
3bf263c97e am b5c4437f: Import revised translations. DO NOT MERGE
* commit 'b5c4437f336c3e79d34428de0b1b7ce22785fb29':
  Import revised translations.  DO NOT MERGE
2011-06-16 14:29:39 -07:00
Amith Yamasani
0ae7893ab9 Merge "Enable the PowerControl widget that was disabled for honeycomb." 2011-06-16 11:10:08 -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
Amith Yamasani
b4b1b400d9 Enable the PowerControl widget that was disabled for honeycomb.
Widget will be selectively disabled for certain devices.

Change-Id: I0c8835e70e21e188d8e2131cb22980744abe8524
2011-06-15 18:00:27 -07:00
Eric Fischer
b5c4437f33 Import revised translations. DO NOT MERGE
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
2011-06-15 15:13:19 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations.
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
2011-06-15 12:09:02 -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
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
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
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
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
Dianne Hackborn
8511809928 am 8d7ecabc: am 60d8b3f8: am 55c86911: Mark access to private resources now that aapt enforces this.
* commit '8d7ecabc6893716d78ede40aedd42683a7627f3c':
  Mark access to private resources now that aapt enforces this.
2011-06-10 12:51:28 -07:00
Justin Ho
6807ecbfad am 9209d20a: am ea8f103f: am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
* commit '9209d20adc0eea6b5fec9de0f1ca21acf5cec92a':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
2011-06-09 18:55:37 -07:00
Dianne Hackborn
8d7ecabc68 am 60d8b3f8: am 55c86911: Mark access to private resources now that aapt enforces this.
* commit '60d8b3f875ae5630330feacc450169223e605166':
  Mark access to private resources now that aapt enforces this.
2011-06-09 16:09:00 -07:00
Dianne Hackborn
60d8b3f875 am 55c86911: Mark access to private resources now that aapt enforces this.
* commit '55c869119aabc27d3b6c6b4aab0e69faf57f1250':
  Mark access to private resources now that aapt enforces this.
2011-06-09 16:04:44 -07:00
Dianne Hackborn
55c869119a Mark access to private resources now that aapt enforces this.
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
2011-06-09 15:33:56 -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
Justin Ho
9209d20adc am ea8f103f: am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
* commit 'ea8f103f8310c869f84d8ad48a167e8e0b63923b':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
2011-06-08 23:33:05 -07:00
Justin Ho
ea8f103f83 am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
* commit '7825cb295c5f08f84282b4bbaeb03da0a536a826':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
2011-06-08 23:30:25 -07:00
Justin Ho
7825cb295c Fixing remaining SetupWizard backgrounds for Flyer
Bug: 4523403

Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
2011-06-08 23:13:05 -07:00
Freeman Ng
3a5764a4bf resolved conflicts for merge of ab48c22e to master
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
2011-06-08 13:33:42 -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
Freeman Ng
0fd7736b71 Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 2011-06-07 12:53:41 -07:00
Marco Nelissen
adcbf72c80 am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
  Allow alternate string to be used for min_number
2011-06-07 11:15:26 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
2011-06-06 16:29:34 -07:00
Eric Fischer
087db10687 Import revised translations.
Change-Id: I18b4dda593468e8af5823db665ee1fb1aac6a812
2011-06-06 16:08:40 -07:00
Freeman Ng
7f6f6e18c9 use prefs-style layout for setup wizard date/time settings on non-xlarge screens
Adjusted the screen size test to fall back to phone version of
DateTimeSettingsSetupWizard on large screens.

I made the following changes from how the phone version works:

1. Some layout changes. (Tablet look, bigger margins.)
2. Use zone picker to select time zone.
3. Added isFirstRun boolean extra to hide the pref fields
we don't need to see from setup wizard

Furthermore, I made the following fixes to the existing phone flow
(which had probably never yet been tried on a phone):

1. Added conditionals around access to some variables that only
exist in the xlarge layout.
2. Implemented PreferenceFragment.OnPreferenceStartFragmentCallback
in DateTimeSettingsSetupWizard in order to catch the user tapping
on the timezone preference and show the time zone picker popup.
(Note: for phones in ICS, we might want to launch the zone picker
preferences style, like it would have been had this been a
PreferenceActivity. Or maybe we should just create a separate
DateTimeSettingsSetupWizardPhone activity that subclasses
PreferencesActivity and doesn't need to play this trick.)

Change-Id: Ib5774a005c9f44d730d86c13746d91eb712141cc
2011-06-06 12:40:28 -07:00
Jeff Brown
e79551c53d am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'a3a96d180f7b1351e6f2aaa8763dc962844fc83e':
  Add a preference panel for mouse speed.
2011-06-03 15:30:16 -07:00
Ben Komalo
11fc3c2044 am 657a7ad8: am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '657a7ad8b279c7a5bbda47c92961a6fbc7473b0b':
  Fix cryptkeeper UI for 7" tablets.
2011-06-03 15:30:14 -07:00
Amith Yamasani
2c6d0d1512 resolved conflicts for merge of 6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
2011-06-03 14:34:30 -07:00
Eric Fischer
fffb0b356e Merge "Import revised translations." 2011-06-03 10:20:35 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:13 -07:00
Ben Komalo
1e43e694ae am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '57b17f50436e4760ad0466aadaafe2599abce442':
  Fix cryptkeeper UI for 7" tablets.
2011-06-02 17:24:42 -07:00
Eric Fischer
22d6d479fd Import revised translations.
Change-Id: I5a80f7e38686bd3ac3cbaa41e2eec06f31c065cf
2011-06-02 16:58:43 -07:00
Amith Yamasani
4baf23770e am be6cb943: am 9ef2713f: am 1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit 'be6cb943db338e528915ccb6900c1c0afb3af117':
  Reduce padding to the left of progress category to match framework changes.
2011-06-02 16:49:31 -07:00
Jeff Brown
d82487b0ff Add a preference panel for mouse speed.
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
2011-06-02 15:13:27 -07:00
Ben Komalo
a1d57709c2 Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered

Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
2011-06-02 13:59:03 -07:00
Amith Yamasani
672ad8d66f am 8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '8ac8456491e1409a071c7cf4e164440aeec7c4dd':
  Move assets to default location, instead of xlarge only.
2011-06-01 18:37:38 -07:00
Amith Yamasani
8ac8456491 Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2 2011-06-01 15:43:42 -07:00
Amith Yamasani
12f55852c0 Move assets to default location, instead of xlarge only.
Bug: 4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
2011-06-01 15:29:55 -07:00
Brian Carlstrom
79e309a9b8 Merge "Integrating keystore with keyguard (Part 4 of 4)" 2011-06-01 14:33:40 -07:00
Dianne Hackborn
2064149e42 am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.
* commit 'c837756d732eb1cc2c26c2d111668ac22a5ff4c6':
  Implement new manage apps UI for compat mode.
2011-06-01 11:26:25 -07:00
Freeman Ng
f75c6e20ad am f0fae7f2: am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit 'f0fae7f27295df2dff531a6293840479a64f7984':
  make setup wizard's wifi and datetime settings look good for 7"
2011-06-01 11:26:20 -07:00
Brian Carlstrom
d4023b7cca Integrating keystore with keyguard (Part 4 of 4)
Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
2011-06-01 10:47:42 -07:00