OSDN Git Service
Freeman Ng [Fri, 10 Jun 2011 01:20:04 +0000 (18:20 -0700)]
Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 23:09:00 +0000 (16:09 -0700)]
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.
Dianne Hackborn [Thu, 9 Jun 2011 23:04:44 +0000 (16:04 -0700)]
am
55c86911: Mark access to private resources now that aapt enforces this.
* commit '
55c869119aabc27d3b6c6b4aab0e69faf57f1250':
Mark access to private resources now that aapt enforces this.
Freeman Ng [Thu, 9 Jun 2011 22:42:25 +0000 (15:42 -0700)]
remove disabling of Back/Dismiss button for 10" mode
bug:
4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
Dianne Hackborn [Thu, 9 Jun 2011 22:33:56 +0000 (15:33 -0700)]
Mark access to private resources now that aapt enforces this.
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
Jean-Baptiste Queru [Thu, 9 Jun 2011 22:01:35 +0000 (15:01 -0700)]
Reconcile with gingerbread-release
Change-Id: I59e35b5788a1c7855a97bd4577d0c44f066c0bd1
Freeman Ng [Thu, 9 Jun 2011 19:00:35 +0000 (12:00 -0700)]
add "behind" screen orientation to prevent spurious flipping
Calling setRequestedOrientation() before setContentView() used to
start activities off in the desired orientation even if the device
was in the opposite orientation, but now, there's a kind of lag
where they display briefly in the device orientation before
flipping to the request one. This change eliminates this effect.
bug:
4581374
Change-Id: I807b0a0a8a247ec8e51b85707afcbd9f75ed9956
Jeff Sharkey [Thu, 9 Jun 2011 18:22:14 +0000 (11:22 -0700)]
Merge "Checkpoint of data usage UI, graphs and lists."
Joe Onorato [Thu, 9 Jun 2011 16:44:56 +0000 (09:44 -0700)]
Merge "Remove this setting that never really got finished."
Joe Onorato [Thu, 9 Jun 2011 16:44:30 +0000 (09:44 -0700)]
Remove this setting that never really got finished.
Change-Id: Id52d7e4f735a2a289533fc9d8461f70218601764
Jeff Sharkey [Mon, 30 May 2011 23:19:56 +0000 (16:19 -0700)]
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
Justin Ho [Thu, 9 Jun 2011 06:33:05 +0000 (23:33 -0700)]
am
ea8f103f: am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
ea8f103f8310c869f84d8ad48a167e8e0b63923b':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 06:30:25 +0000 (23:30 -0700)]
am
7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
* commit '
7825cb295c5f08f84282b4bbaeb03da0a536a826':
Fixing remaining SetupWizard backgrounds for Flyer Bug:
4523403
Justin Ho [Thu, 9 Jun 2011 02:25:29 +0000 (19:25 -0700)]
Fixing remaining SetupWizard backgrounds for Flyer
Bug:
4523403
Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
Irfan Sheriff [Thu, 9 Jun 2011 00:32:04 +0000 (17:32 -0700)]
am
4a1b8898: am
f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '
4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
Fix UI settings display issues
Jaikumar Ganesh [Wed, 8 Jun 2011 21:46:27 +0000 (14:46 -0700)]
am
3f3f390b: am
a6daa21d: (-s ours) am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
3f3f390b87113444c41b38b145f9a6ce0984d31d':
Import translations for cherry-picked Bluetooth changes.
Freeman Ng [Wed, 8 Jun 2011 21:35:18 +0000 (14:35 -0700)]
Merge "fix breakage caused by recent automerge"
Freeman Ng [Wed, 8 Jun 2011 21:34:23 +0000 (14:34 -0700)]
fix breakage caused by recent automerge
Change-Id: Ifb4c8428f5ebc728146da848cb0319626854c667
Freeman Ng [Wed, 8 Jun 2011 20:33:42 +0000 (13:33 -0700)]
resolved conflicts for merge of
ab48c22e to master
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
satok [Wed, 8 Jun 2011 11:09:14 +0000 (04:09 -0700)]
Merge "Use getDisplayName for the name of InputMethodSubtype"
satok [Wed, 8 Jun 2011 09:44:52 +0000 (18:44 +0900)]
Use getDisplayName for the name of InputMethodSubtype
Change-Id: I9ad7790bc36ff2950e0238cae8ce3b785bb8eaa1
Freeman Ng [Wed, 8 Jun 2011 01:20:19 +0000 (18:20 -0700)]
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
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:29 +0000 (17:53 -0700)]
am
37940170: (-s ours) am
bd34e568: (-s ours) am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
37940170d00130d55d379178413f115b3feb59c4':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:26 +0000 (17:53 -0700)]
am
eeb7803a: (-s ours) am
aeca1851: (-s ours) am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
eeb7803a9545e5574ef70831285f5121fe68a564':
Allow users to change the length of BT disoverability. DO NOT MERGE
Gilles Debunne [Wed, 8 Jun 2011 00:17:56 +0000 (17:17 -0700)]
am
62634b30: am
440ca974: am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
62634b309ab6c352a37c4d79d50fc78ab806304f':
Bug
4539424: confirmation dialog always shown
Irfan Sheriff [Tue, 7 Jun 2011 20:58:28 +0000 (13:58 -0700)]
am
f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '
f448c32d9b4718e657fd4811f43d8df0f9d921af':
Fix UI settings display issues
Irfan Sheriff [Tue, 7 Jun 2011 20:54:53 +0000 (13:54 -0700)]
Merge "Fix UI settings display issues" into honeycomb-LTE
Jaikumar Ganesh [Tue, 7 Jun 2011 20:17:35 +0000 (13:17 -0700)]
am
a6daa21d: (-s ours) am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
a6daa21db833191a4e83aac5c488f971bff4578c':
Import translations for cherry-picked Bluetooth changes.
Freeman Ng [Tue, 7 Jun 2011 20:16:13 +0000 (13:16 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 19:58:06 +0000 (12:58 -0700)]
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
Freeman Ng [Tue, 7 Jun 2011 19:53:41 +0000 (12:53 -0700)]
Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
Irfan Sheriff [Tue, 7 Jun 2011 19:28:26 +0000 (12:28 -0700)]
Fix UI settings display issues
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks
Bug:
4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
Freeman Ng [Tue, 7 Jun 2011 18:51:23 +0000 (11:51 -0700)]
am
351367bb: am
f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '
351367bbd830646ddeed49227ab37442479556f9':
add options to lock suw wifi setup orientation into portrait or landscape
Freeman Ng [Tue, 7 Jun 2011 18:48:33 +0000 (11:48 -0700)]
am
f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '
f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
add options to lock suw wifi setup orientation into portrait or landscape
Freeman Ng [Tue, 7 Jun 2011 18:46:02 +0000 (11:46 -0700)]
Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
Marco Nelissen [Tue, 7 Jun 2011 18:15:26 +0000 (11:15 -0700)]
am
079e30cd: resolved conflicts for merge of
531bed61 to honeycomb-plus-aosp
* commit '
079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
Allow alternate string to be used for min_number
Gilles Debunne [Tue, 7 Jun 2011 18:14:41 +0000 (11:14 -0700)]
am
cfe26919: am
533b7b53: am
90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
* commit '
cfe26919abcd3c466f40b437d084311bf025d449':
Used space visible in SD Card bar graph
Gilles Debunne [Tue, 7 Jun 2011 18:14:31 +0000 (11:14 -0700)]
am
b7e7a8cb: am
2a9dfc5c: am
99da1a22: Always show unmount confirmation dialog
* commit '
b7e7a8cb9cfa8b6fb7cd6b6d10913a00c45967f9':
Always show unmount confirmation dialog
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:40 +0000 (10:01 -0700)]
am
bd34e568: (-s ours) am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
bd34e568bf0a986f7254b93ac3b69fe3c0459162':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:36 +0000 (10:01 -0700)]
am
aeca1851: (-s ours) am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
aeca185107481f28ad248c4f811bd708be8f5bff':
Allow users to change the length of BT disoverability. DO NOT MERGE
Gilles Debunne [Tue, 7 Jun 2011 01:18:31 +0000 (18:18 -0700)]
am
440ca974: am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
440ca97483553d2656b90001beabe76d38773544':
Bug
4539424: confirmation dialog always shown
Gilles Debunne [Tue, 7 Jun 2011 00:14:03 +0000 (17:14 -0700)]
am
8f1bd8a7: Bug
4539424: confirmation dialog always shown
* commit '
8f1bd8a7526edf49196430be214acb54e66a63ee':
Bug
4539424: confirmation dialog always shown
Marco Nelissen [Mon, 6 Jun 2011 23:29:34 +0000 (16:29 -0700)]
resolved conflicts for merge of
531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
Freeman Ng [Mon, 6 Jun 2011 23:27:55 +0000 (16:27 -0700)]
add options to lock suw wifi setup orientation into portrait or landscape
bug:
4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
Eric Fischer [Mon, 6 Jun 2011 23:08:40 +0000 (16:08 -0700)]
Import revised translations.
Change-Id: I18b4dda593468e8af5823db665ee1fb1aac6a812
Gilles Debunne [Mon, 6 Jun 2011 22:48:08 +0000 (15:48 -0700)]
Bug
4539424: confirmation dialog always shown
Change-Id: Id1e2a52a07255e2c98cbd0e8151a82d7a2612517
Gilles Debunne [Mon, 6 Jun 2011 22:22:53 +0000 (15:22 -0700)]
am
533b7b53: am
90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
* commit '
533b7b53bcff1a682f295398293878f85ec419e3':
Used space visible in SD Card bar graph
Gilles Debunne [Mon, 6 Jun 2011 22:22:51 +0000 (15:22 -0700)]
am
2a9dfc5c: am
99da1a22: Always show unmount confirmation dialog
* commit '
2a9dfc5c0c8cd75a5eac7a75fda7e25e5ce9f27f':
Always show unmount confirmation dialog
Gilles Debunne [Mon, 6 Jun 2011 22:18:37 +0000 (15:18 -0700)]
am
90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
* commit '
90599cdfe8ff528b34e3578333c5eea83cf3b293':
Used space visible in SD Card bar graph
Gilles Debunne [Mon, 6 Jun 2011 22:18:35 +0000 (15:18 -0700)]
am
99da1a22: Always show unmount confirmation dialog
* commit '
99da1a22a35eed631a757ccbf1bac1d7af74124d':
Always show unmount confirmation dialog
Gilles Debunne [Mon, 6 Jun 2011 22:16:05 +0000 (15:16 -0700)]
Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
The Android Automerger [Mon, 6 Jun 2011 22:00:36 +0000 (15:00 -0700)]
merge in gingerbread-release history after reset to gingerbread
Freeman Ng [Thu, 2 Jun 2011 22:44:51 +0000 (15:44 -0700)]
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
Amith Yamasani [Fri, 3 Jun 2011 22:55:28 +0000 (15:55 -0700)]
am
51a1bb15: am
ad466222: am
51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '
51a1bb15ea2d669d783e1938deb7eb061f3112da':
Fix account type dialog re-creation on orientation change.
Jeff Brown [Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)]
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.
Ben Komalo [Fri, 3 Jun 2011 22:30:14 +0000 (15:30 -0700)]
am
657a7ad8: am
1e43e694: am
57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '
657a7ad8b279c7a5bbda47c92961a6fbc7473b0b':
Fix cryptkeeper UI for 7" tablets.
Amith Yamasani [Fri, 3 Jun 2011 22:29:25 +0000 (15:29 -0700)]
am
1334d7fc: am
300c4f61: am
3a5b3494: Make the BT class icon visible.
* commit '
1334d7fc3a3a1fd2f48aed93d9344115d674fcc2':
Make the BT class icon visible.
Gilles Debunne [Fri, 3 Jun 2011 21:47:12 +0000 (14:47 -0700)]
Always show unmount confirmation dialog
Somehow related to bug
4534261
Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
Amith Yamasani [Fri, 3 Jun 2011 21:34:30 +0000 (14:34 -0700)]
resolved conflicts for merge of
6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
Gilles Debunne [Fri, 3 Jun 2011 21:26:55 +0000 (14:26 -0700)]
Used space visible in SD Card bar graph
Bug
4544470
Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
Eric Fischer [Fri, 3 Jun 2011 17:20:35 +0000 (10:20 -0700)]
Merge "Import revised translations."
Brian Carlstrom [Fri, 3 Jun 2011 04:06:56 +0000 (21:06 -0700)]
Merge "Bulletproof CredentialStorage state handling"
Brian Carlstrom [Thu, 2 Jun 2011 23:47:15 +0000 (16:47 -0700)]
Bulletproof CredentialStorage state handling
As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.
src/com/android/settings/CredentialStorage.java
Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.
constant declaration here, since its used by callers of
ChooseLockSettingsHelper.launchConfirmationActivity
src/com/android/settings/ChooseLockSettingsHelper.java
old producer
src/com/android/settings/ConfirmLockPassword.java
new producer (CredentialStorage wants passwords and patterns)
src/com/android/settings/ConfirmLockPattern.java
new consumer
src/com/android/settings/CredentialStorage.java
old consumer
src/com/android/settings/CryptKeeperSettings.java
Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.
src/com/android/settings/ChooseLockSettingsHelper.java
Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
Amith Yamasani [Fri, 3 Jun 2011 01:29:49 +0000 (18:29 -0700)]
am
ad466222: am
51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '
ad4662223210827df1e62ba4c7ec24dba80a47df':
Fix account type dialog re-creation on orientation change.
Amith Yamasani [Fri, 3 Jun 2011 01:27:54 +0000 (18:27 -0700)]
am
51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '
51a9d15722b3c94ac92e05b19048b678247b034e':
Fix account type dialog re-creation on orientation change.
Amith Yamasani [Fri, 3 Jun 2011 01:26:28 +0000 (18:26 -0700)]
Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
Amith Yamasani [Fri, 3 Jun 2011 01:05:40 +0000 (18:05 -0700)]
Fix account type dialog re-creation on orientation change.
Bug:
4499512
Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.
Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80
Jeff Brown [Fri, 3 Jun 2011 00:31:11 +0000 (17:31 -0700)]
am
bb8fc4a4: am
9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
Add a preference panel for mouse speed.
Ben Komalo [Fri, 3 Jun 2011 00:28:25 +0000 (17:28 -0700)]
am
1e43e694: am
57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '
1e43e694ae0822426d4759aa2d5192cbe5d15d63':
Fix cryptkeeper UI for 7" tablets.
Jeff Brown [Fri, 3 Jun 2011 00:27:39 +0000 (17:27 -0700)]
am
9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '
9fc039e7bcea7f1845a51fcb70d608663ceec227':
Add a preference panel for mouse speed.
Jeff Brown [Fri, 3 Jun 2011 00:26:13 +0000 (17:26 -0700)]
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
Ben Komalo [Fri, 3 Jun 2011 00:24:42 +0000 (17:24 -0700)]
am
57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '
57b17f50436e4760ad0466aadaafe2599abce442':
Fix cryptkeeper UI for 7" tablets.
Ben Komalo [Fri, 3 Jun 2011 00:21:39 +0000 (17:21 -0700)]
Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
Eric Fischer [Thu, 2 Jun 2011 23:58:43 +0000 (16:58 -0700)]
Import revised translations.
Change-Id: I5a80f7e38686bd3ac3cbaa41e2eec06f31c065cf
Amith Yamasani [Thu, 2 Jun 2011 23:49:31 +0000 (16:49 -0700)]
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.
Jeff Brown [Thu, 2 Jun 2011 10:10:28 +0000 (03:10 -0700)]
Add a preference panel for mouse speed.
Bug:
4124987
Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
Gilles Debunne [Thu, 2 Jun 2011 22:07:51 +0000 (15:07 -0700)]
am
b667422c: am
41a99004: am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
b667422cfdaf73d693bf79ce6186e082b68862b8':
Erase SD Card fixed in Settings/Storage.
Ben Komalo [Thu, 2 Jun 2011 18:40:00 +0000 (11:40 -0700)]
Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered
Bug:
4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
Amith Yamasani [Thu, 2 Jun 2011 20:17:05 +0000 (13:17 -0700)]
am
300c4f61: am
3a5b3494: Make the BT class icon visible.
* commit '
300c4f61d823936e4a34fcece25c14c73877c994':
Make the BT class icon visible.
Amith Yamasani [Thu, 2 Jun 2011 20:13:38 +0000 (13:13 -0700)]
am
3a5b3494: Make the BT class icon visible.
* commit '
3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
Make the BT class icon visible.
Amith Yamasani [Thu, 2 Jun 2011 18:48:55 +0000 (11:48 -0700)]
Make the BT class icon visible.
This change is required due to a change in the framework to accomodate smaller screen sizes.
Bug:
4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
Eric Fischer [Thu, 2 Jun 2011 10:20:48 +0000 (03:20 -0700)]
am
3518cdf9: (-s ours) am
c3786952: am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
3518cdf91489264226564898177e7738ff28683c':
Import revised translations. DO NOT MERGE
Amith Yamasani [Thu, 2 Jun 2011 02:06:55 +0000 (19:06 -0700)]
am
672ad8d6: am
8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '
672ad8d66f61db0804fcf4ba9a0db067272a4b50':
Move assets to default location, instead of xlarge only.
Amith Yamasani [Thu, 2 Jun 2011 01:37:38 +0000 (18:37 -0700)]
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.
Jeff Sharkey [Sat, 28 May 2011 01:26:15 +0000 (18:26 -0700)]
Replace INetStatService with TrafficStats.
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
Amith Yamasani [Wed, 1 Jun 2011 22:43:42 +0000 (15:43 -0700)]
Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
Amith Yamasani [Wed, 1 Jun 2011 22:29:55 +0000 (15:29 -0700)]
Move assets to default location, instead of xlarge only.
Bug:
4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
Brian Carlstrom [Wed, 1 Jun 2011 21:33:40 +0000 (14:33 -0700)]
Merge "Integrating keystore with keyguard (Part 4 of 4)"
Dianne Hackborn [Wed, 1 Jun 2011 18:26:25 +0000 (11:26 -0700)]
am
c837756d: am
b4799fc9: am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
c837756d732eb1cc2c26c2d111668ac22a5ff4c6':
Implement new manage apps UI for compat mode.
Freeman Ng [Wed, 1 Jun 2011 18:26:20 +0000 (11:26 -0700)]
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"
Brian Carlstrom [Wed, 25 May 2011 20:24:20 +0000 (13:24 -0700)]
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
Gilles Debunne [Wed, 1 Jun 2011 17:11:15 +0000 (10:11 -0700)]
Merge "Bug
4505185: fix NPE when file list is empty"
Gilles Debunne [Wed, 1 Jun 2011 00:32:44 +0000 (17:32 -0700)]
Bug
4505185: fix NPE when file list is empty
Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
Adam Powell [Tue, 31 May 2011 23:02:30 +0000 (16:02 -0700)]
am
7d4e88b3: am
57218b5a: am
3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '
7d4e88b3d4f4f5b17a93f3be8fe19b65df45b0d7':
Fix account type selector for adding accounts to match holo layout guidelines.
Jim Miller [Tue, 31 May 2011 23:01:17 +0000 (16:01 -0700)]
am
c78f8769: am
fbc72cd6: am
fd8f7f12: Merge "Fix
4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit '
c78f87694ddff4badfc1953821250eb68d237330':
Fix
4462497: Make ownerinfo preference layout more dynamic
Amith Yamasani [Fri, 27 May 2011 21:53:12 +0000 (14:53 -0700)]
am
9ef2713f: am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
9ef2713f2862ca13822a35e316555dda3e264352':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:51:28 +0000 (14:51 -0700)]
am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
1f7014a25aad4cd3fe5e6f34eb30d936f4da2fd4':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:49:21 +0000 (14:49 -0700)]
Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
Amith Yamasani [Fri, 27 May 2011 21:31:28 +0000 (14:31 -0700)]
Reduce padding to the left of progress category to match framework changes.
Otherwise the WIFI/BT device names don't align with the header.
Change-Id: Ibd10cb7bb38c80a90ef895e2bdb1083b833a2824
Jaikumar Ganesh [Fri, 27 May 2011 20:47:08 +0000 (13:47 -0700)]
am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
015788ca9228312dfca30785b1801f33a3a32e9a':
Import translations for cherry-picked Bluetooth changes.