OSDN Git Service
The Android Automerger [Fri, 4 May 2012 23:16:08 +0000 (16:16 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Sharkey [Fri, 4 May 2012 19:04:18 +0000 (12:04 -0700)]
Merge "Avoid animation flashing and fix padding." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 18:47:29 +0000 (11:47 -0700)]
Avoid animation flashing and fix padding.
Bug:
6446203
Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
Jeff Sharkey [Fri, 4 May 2012 18:15:29 +0000 (11:15 -0700)]
Merge "Better messaging when Wi-Fi disabled." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 17:26:46 +0000 (10:26 -0700)]
Better messaging when Wi-Fi disabled.
Bug:
6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
satok [Fri, 4 May 2012 05:15:03 +0000 (22:15 -0700)]
Merge "Always on the valid system default ime" into jb-dev
Eric Fischer [Thu, 3 May 2012 23:01:16 +0000 (16:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 22:55:12 +0000 (15:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb5adb2d887e6264aca0e664a119e9421739b2e5
Jeff Sharkey [Thu, 3 May 2012 22:13:49 +0000 (15:13 -0700)]
Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev
Jeff Sharkey [Thu, 3 May 2012 22:02:06 +0000 (15:02 -0700)]
Fall back to Wi-Fi data when SIM missing.
Bug:
6427657
Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa
Vikram Aggarwal [Wed, 2 May 2012 23:29:10 +0000 (16:29 -0700)]
UI fixes for tablets
1. Center the clock on Xoom and large tablets. Fix b/
5579000
2. Correctly remove the emergency call button if the device (*cough*
Nakasi *cough*) does not have telephone capability.
Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
The Android Automerger [Thu, 3 May 2012 14:19:00 +0000 (07:19 -0700)]
merge in jb-release history after reset to jb-dev
Vikram Aggarwal [Wed, 2 May 2012 23:19:10 +0000 (16:19 -0700)]
Merge "Include the clock in landscape on Xoom" into jb-dev
Vikram Aggarwal [Wed, 2 May 2012 23:07:14 +0000 (16:07 -0700)]
Merge "Notification alert every 5s and start after 30s." into jb-dev
Vikram Aggarwal [Wed, 2 May 2012 22:08:38 +0000 (15:08 -0700)]
Include the clock in landscape on Xoom
1. R.id.status was defined twice and was used inconsistently in code:
(visibility set to enabled, but only on portrait...) This code removes
the bad view.
2. The TextView date was never used, either by another layout or by
code. Deleting this view too.
3. Including a standard status layout on smallest-width-600px, which includes
a clock and a status message on Xoom.
Fix b/
6061076
Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d
Eric Fischer [Wed, 2 May 2012 21:11:40 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7a0ad55aa358abded6d5fe7d9d75b34dfc1c450
Vikram Aggarwal [Tue, 1 May 2012 23:46:06 +0000 (16:46 -0700)]
Notification alert every 5s and start after 30s.
Justification: Most users will not need prompting, so for them a
notification will be an annoyance. So we only notify if the no
password has been entered for 30 seconds.
Once a notification sound is made, we need to make it frequently so
the user can locate the device.
Change-Id: Ibf531aec89b5e3b3c72eaa36016bcc4cac1d6493
The Android Automerger [Wed, 2 May 2012 14:10:58 +0000 (07:10 -0700)]
merge in jb-release history after reset to jb-dev
satok [Wed, 2 May 2012 11:51:49 +0000 (20:51 +0900)]
Always on the valid system default ime
Bug:
6422390
Change-Id: I9af4065e4b9f9332f3b0db168dea5546727d5951
Amith Yamasani [Tue, 1 May 2012 23:15:25 +0000 (16:15 -0700)]
Merge "Fix NPE in ManageApps when switching orientation." into jb-dev
Vikram Aggarwal [Tue, 1 May 2012 22:37:30 +0000 (15:37 -0700)]
Notify user when waiting for decryption password
1. Disable back presses from physical keyboard during encryption: Fix b/
6139810
2. Keep screen on when waiting for password. Fix b/
6153213 and b/
6149606
3. Alert the user with sound when waiting for password. Fix b/
6149606
4. Add debugging feature to display the password screen without having to reboot the device.
Change-Id: I588aa7d96e1140f95a6fa91e0281117907f666f7
Amith Yamasani [Tue, 1 May 2012 21:28:22 +0000 (14:28 -0700)]
Fix NPE in ManageApps when switching orientation.
Bug:
6394351
Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c
Eric Fischer [Tue, 1 May 2012 20:49:40 +0000 (13:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 20:32:21 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
Brian Carlstrom [Tue, 1 May 2012 18:17:02 +0000 (11:17 -0700)]
Do not reuse master_clear_gesture_* strings for credential installation confirmation
Bug: http://code.google.com/p/android/issues/detail?id=29367
Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
Vikram Aggarwal [Tue, 1 May 2012 18:09:39 +0000 (11:09 -0700)]
Enable back in CryptKeeper
Fix b/
6280906
Change-Id: I38d75c4b4c928c77c20bf8eca2649bf6eaa95507
The Android Automerger [Tue, 1 May 2012 14:05:43 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Mon, 30 Apr 2012 23:19:46 +0000 (16:19 -0700)]
Fix manual brightness adjustment.
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug:
6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
Irfan Sheriff [Tue, 1 May 2012 00:12:33 +0000 (17:12 -0700)]
Merge "Add wifi direct menu only for supported devices" into jb-dev
Jeff Brown [Mon, 30 Apr 2012 23:49:26 +0000 (16:49 -0700)]
Merge "Fix manual brightness adjustment." into jb-dev
Irfan Sheriff [Mon, 30 Apr 2012 23:26:20 +0000 (16:26 -0700)]
Add wifi direct menu only for supported devices
Bug:
6421096
Change-Id: Iaf0ad85e97be8d750dd74808f840c6731d8130fd
Jeff Brown [Mon, 30 Apr 2012 23:19:46 +0000 (16:19 -0700)]
Fix manual brightness adjustment.
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug:
6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
Eric Fischer [Mon, 30 Apr 2012 21:59:39 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Gilles Debunne [Mon, 30 Apr 2012 21:32:35 +0000 (14:32 -0700)]
Merge "Fixed inconsistent gray background in Running app detail" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:41:01 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ea710c8a4a09a1e8a144d9b713e1fe9738c987d
Amith Yamasani [Mon, 30 Apr 2012 20:37:32 +0000 (13:37 -0700)]
Merge "Move tether settings help to menu and remove local assets." into jb-dev
Gilles Debunne [Mon, 30 Apr 2012 19:47:31 +0000 (12:47 -0700)]
Fixed inconsistent gray background in Running app detail
This is a cherry pick of https://android-review.googlesource.com/#/c/35200/
Checked with UI that this backgroud color was not wanted.
Change-Id: I10cd6757ed17fd3cf34f04e5d14e6f210f78ab2c
The Android Automerger [Mon, 30 Apr 2012 14:05:01 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Irfan Sheriff [Sat, 28 Apr 2012 17:51:18 +0000 (10:51 -0700)]
Merge "Fix WPS string" into jb-dev
Eric Fischer [Sat, 28 Apr 2012 03:51:35 +0000 (20:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Irfan Sheriff [Sat, 28 Apr 2012 03:30:24 +0000 (20:30 -0700)]
Fix WPS string
Change-Id: I5d45863c868c627fc48eefe1e15cb737b694d8ac
Jim Miller [Sat, 28 Apr 2012 02:17:45 +0000 (19:17 -0700)]
Merge "Fix
6291333: Don't show multiple pin/pattern/password confirmations" into jb-dev
Jim Miller [Sat, 28 Apr 2012 01:11:03 +0000 (18:11 -0700)]
Fix
6291333: Don't show multiple pin/pattern/password confirmations
This fixes a bug where orientation changes caused the system to
ask for the pin/pattern/password multiple times.
It also fixes a minor issue where we were showing buttons
on the pattern confirmation screen (bug
6218057)
Change-Id: I0894f37bb697baa4cc17917aaeb466440279b092
Amith Yamasani [Sat, 28 Apr 2012 00:38:40 +0000 (17:38 -0700)]
Move tether settings help to menu and remove local assets.
Bug:
5270092
Using web help instead of local assets.
Change-Id: Ib93e72443b30367521febc43279422ec130efbd5
Irfan Sheriff [Fri, 27 Apr 2012 23:43:38 +0000 (16:43 -0700)]
Merge "Ignore invalid network forget" into jb-dev
Irfan Sheriff [Fri, 27 Apr 2012 22:36:30 +0000 (15:36 -0700)]
Ignore invalid network forget
Bug:
6397063
Change-Id: I066bd45e95b7e8671bc7dfcb83e46246f110b3a9
Romain Guy [Fri, 27 Apr 2012 22:29:59 +0000 (15:29 -0700)]
Merge "Add three new developer settings" into jb-dev
Romain Guy [Fri, 27 Apr 2012 22:27:54 +0000 (15:27 -0700)]
Add three new developer settings
- Show hw screen updates: show where apps udpate the screen when running with
hw acceleration
- Profile hw rendering: add extra profiling info to dumpsys gfxinfo for
performance tracking
- Debug layout: show layout info on screen
Change-Id: I6f7cad762d65ec3be2debfb4a88c25d35bf11079
Eric Fischer [Fri, 27 Apr 2012 20:37:24 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4917f245f548a61165e7e36367d99871d6474408
Amith Yamasani [Fri, 27 Apr 2012 17:47:59 +0000 (10:47 -0700)]
Merge "Make Manage Apps remember which tab was shown." into jb-dev
Irfan Sheriff [Fri, 27 Apr 2012 16:55:45 +0000 (09:55 -0700)]
Merge "Allow p2p device rename" into jb-dev
Irfan Sheriff [Wed, 25 Apr 2012 23:32:19 +0000 (16:32 -0700)]
Allow p2p device rename
Change-Id: Ib61425da344f955b0a583716516181bdfbd4b504
Amith Yamasani [Thu, 26 Apr 2012 23:27:43 +0000 (16:27 -0700)]
Make Manage Apps remember which tab was shown.
This fixes the forgetfulness on orientation change. The code was
already in, but there was a typo in the key string that saved the tab.
Bug:
6000318
Change-Id: If29f42b83aa0ec9f05061b8690e0bdbe8c4a2812
Eric Fischer [Thu, 26 Apr 2012 22:48:31 +0000 (15:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I35b0b64b3819b917c8dc312c93bacb89bf4a7d1e
Russell Brenner [Mon, 23 Apr 2012 18:38:34 +0000 (11:38 -0700)]
Restore look of Wi-Fi panel for Setup Wizard
As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.
Bug:
5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
The Android Automerger [Wed, 25 Apr 2012 14:49:01 +0000 (07:49 -0700)]
merge in jb-release history after reset to jb-dev
Michael Jurka [Wed, 25 Apr 2012 02:06:17 +0000 (19:06 -0700)]
Merge "New API to allow third-party apps to bind widgets"
Michael Jurka [Fri, 20 Apr 2012 08:47:44 +0000 (01:47 -0700)]
New API to allow third-party apps to bind widgets
Change-Id: Ieec9f247fdbfc02c2ad8f5bb7f6b9efe0669af84
Amith Yamasani [Tue, 24 Apr 2012 22:24:25 +0000 (15:24 -0700)]
Merge "Safeguard from monkeys."
Amith Yamasani [Tue, 24 Apr 2012 22:09:10 +0000 (15:09 -0700)]
Safeguard from monkeys.
Bug:
6315950
Change-Id: I680b3f0a2cee565a39d58e95a8abe5f62cc7b466
Eric Fischer [Tue, 24 Apr 2012 20:55:56 +0000 (13:55 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 24 Apr 2012 20:44:08 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaccf544def97f82cc295a845a90961dae92c1116
Amith Yamasani [Tue, 24 Apr 2012 20:23:12 +0000 (13:23 -0700)]
Merge "Make home-as-up work in UserDictionarySettings"
Amith Yamasani [Tue, 24 Apr 2012 20:06:39 +0000 (13:06 -0700)]
Make home-as-up work in UserDictionarySettings
Since the home-as-up icon is delivered through onOptionsItemSelected,
need to check the ID.
Bug:
6388649
Change-Id: I00041b1a15e102826d05a40fdd288a9d8712dc48
Amith Yamasani [Tue, 24 Apr 2012 18:53:31 +0000 (11:53 -0700)]
Merge "Fix NPE due to delayed event handling."
Jeff Sharkey [Tue, 24 Apr 2012 18:36:38 +0000 (11:36 -0700)]
Merge "Fix data usage settings button visibility."
Jeff Sharkey [Tue, 24 Apr 2012 18:35:43 +0000 (11:35 -0700)]
Fix data usage settings button visibility.
Also check that fragment is attached before launching intent.
Bug:
6385040
Change-Id: If857758acbf6fe17c8ffbd75226114346ffe6c62
Amith Yamasani [Tue, 24 Apr 2012 18:35:38 +0000 (11:35 -0700)]
Fix NPE due to delayed event handling.
a.k.a., annoying monkeys.
Bug:
6336430
Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542
The Android Automerger [Tue, 24 Apr 2012 14:04:50 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Dianne Hackborn [Tue, 24 Apr 2012 01:55:32 +0000 (18:55 -0700)]
Merge "Deal correctly with an unset brightness adjustment."
Dianne Hackborn [Tue, 24 Apr 2012 01:22:13 +0000 (18:22 -0700)]
Deal correctly with an unset brightness adjustment.
Change-Id: I191051989bad68f31210bbc717fbabd59d4585a1
Amith Yamasani [Tue, 24 Apr 2012 01:03:52 +0000 (18:03 -0700)]
Delay calling setHasOptionsMenu() to avoid a crash in Wifi Settings
If it is called in onCreate(), it's too early for Wifi Settings,
which does its initialization in onActivityCreated().
Change-Id: I3d9b49f63d342e724fd4795fbca48d08faa3c3cc
Amith Yamasani [Mon, 23 Apr 2012 22:38:50 +0000 (15:38 -0700)]
Merge "Help menus for several screens."
Amith Yamasani [Mon, 23 Apr 2012 22:35:36 +0000 (15:35 -0700)]
Help menus for several screens.
Bug:
5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
Eric Fischer [Mon, 23 Apr 2012 20:56:20 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Mon, 23 Apr 2012 20:46:10 +0000 (13:46 -0700)]
Don't let monkeys launch storage management activities.
Guard against monkeys in two places where intents to other activities are
launched.
Bug:
5415988
Change-Id: Ia3c5514c02423f7b249f655296bb02e279789dfd
Eric Fischer [Mon, 23 Apr 2012 20:29:34 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibf98cce0aba64bd356fffb7de80ca13bbab3cacd
Jeff Sharkey [Mon, 23 Apr 2012 17:08:06 +0000 (10:08 -0700)]
Merge "Use statfs() in IMediaContainerService."
The Android Automerger [Mon, 23 Apr 2012 14:05:54 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Daniel Sandler [Thu, 19 Apr 2012 05:47:45 +0000 (01:47 -0400)]
Add notification shutoff switch to app details page.
Requires change Ieccac574.
Bug:
5547401
Change-Id: I9856658cc638723414a5c2c3c6807241c3ce6166
Jeff Sharkey [Mon, 23 Apr 2012 01:57:44 +0000 (18:57 -0700)]
Use statfs() in IMediaContainerService.
Since Settings runs in system UID, it needs to export statfs()
operations to IMediaContainerService.
Bug:
6346248
Change-Id: I5801948211f0e55040da4850e3dd55b93f80798f
Jeff Sharkey [Sun, 22 Apr 2012 23:06:22 +0000 (16:06 -0700)]
Fix menu string lengths.
Bug:
5497620
Change-Id: I0b4c2cbae8a5cc83ba67355c465c30e5177e8a01
Jeff Sharkey [Sat, 21 Apr 2012 22:41:48 +0000 (15:41 -0700)]
Hide tab when disabled, metered strings, fixes.
Hide "Data usage" item when kernel support isn't available and
enabled. Change "restrict background" strings to reflect metered
status. Hide app settings button when no package found. Always
start limit sweep above any warning. Imply metered state for
networks with limits.
Bug:
6303364,
5465643,
5379686,
6376276,
6368329,
6376276
Change-Id: I4faccc9a50f2f741fd937bb8c361a3ca055135e2
Jeff Sharkey [Fri, 20 Apr 2012 23:03:31 +0000 (16:03 -0700)]
Merge "Leave unmetered Wi-Fi network policies intact."
Eric Fischer [Fri, 20 Apr 2012 21:27:19 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 20 Apr 2012 20:56:13 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03e7d4c13f555abb9d97b420ceb7cf0dfe345089
Dianne Hackborn [Fri, 20 Apr 2012 20:44:51 +0000 (13:44 -0700)]
Merge "Update to follow API change."
Gilles Debunne [Fri, 20 Apr 2012 18:15:45 +0000 (11:15 -0700)]
Merge "Data usage limit label font size fixed"
Dianne Hackborn [Fri, 20 Apr 2012 17:37:42 +0000 (10:37 -0700)]
Update to follow API change.
Change-Id: Ife399fb336016cfa8faadf655d887ae611c6ad9b
Jeff Sharkey [Fri, 20 Apr 2012 06:02:09 +0000 (23:02 -0700)]
Leave unmetered Wi-Fi network policies intact.
They are now removed when the WifiConfiguration is deleted.
Bug:
6344821,
6369307
Change-Id: Id411fa06cec10435501ef03c56d0bcb96ed229db
Eric Fischer [Thu, 19 Apr 2012 20:49:46 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie819b67b4146aac858ccaf31aa9630a2745aec30
Irfan Sheriff [Thu, 19 Apr 2012 16:57:33 +0000 (09:57 -0700)]
Merge "Add Nsd settings checkbox"
The Android Automerger [Thu, 19 Apr 2012 14:04:47 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Irfan Sheriff [Wed, 18 Apr 2012 06:17:46 +0000 (23:17 -0700)]
Add Nsd settings checkbox
Change-Id: I58e54a8bed02ed7bd99b0f284279b6c799e3369f
Eric Fischer [Wed, 18 Apr 2012 22:24:57 +0000 (15:24 -0700)]
Restore deleted string still referenced from XML.
Change-Id: I2a1384db53b5670815503076f28b89712b8c9c00
Eric Fischer [Wed, 18 Apr 2012 21:42:42 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f5bf9b21d66376e163cb4a32fb0a55ebba66cb3
The Android Automerger [Wed, 18 Apr 2012 14:04:51 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Gilles Debunne [Wed, 18 Apr 2012 01:14:36 +0000 (18:14 -0700)]
Data usage limit label font size fixed
Bug
6326750
The font size around the text was removed when its content is replaced.
This is WAI since the spans created from <font> html tags have a
SPAN_EXCLUSIVE_EXCLUSIVE flag. These are removed when their length
becomes 0. The bug came from a recent enforcement of this constraint.
The fix is to change the flags of these AbsoluteSizeSpan spans.
This CL also changes the code to avoid the creation of the int[] array.
Change-Id: Ib58270bb9d1cf0c7609ba1e36d6c0cca841300db
Jeff Brown [Tue, 17 Apr 2012 21:29:29 +0000 (14:29 -0700)]
Merge "Add label for default keyboard layout."
Jeff Brown [Tue, 17 Apr 2012 20:55:15 +0000 (13:55 -0700)]
Add label for default keyboard layout.
Bug:
6110399
Change-Id: I2431b99884cbd01de32f8cd6c14a3afbd18b5020