OSDN Git Service
Baligh Uddin [Mon, 4 Feb 2013 17:59:27 +0000 (09:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6091aef5f86bfdc58cfe83f15e1292e7d86339dd
Auto-generated-cl: translation import
Benoit Goby [Sat, 2 Feb 2013 02:38:48 +0000 (02:38 +0000)]
Merge "Settings: Add setting to clear adb public keys"
Dianne Hackborn [Sat, 2 Feb 2013 01:29:15 +0000 (17:29 -0800)]
App ops: improve presentation.
Change-Id: Ia8702f9421a2cf2e27e8e24bfdc596321ace515a
Dianne Hackborn [Thu, 31 Jan 2013 23:06:57 +0000 (15:06 -0800)]
App ops: Support neighboring cells, call phone, improve UI.
Change-Id: I0783c7ae941499cf9847bcf657141c3aea76f59d
Russell Brenner [Fri, 1 Feb 2013 21:20:29 +0000 (21:20 +0000)]
Merge "Use non-breaking hyphen for "Wi-Fi""
Russell Brenner [Fri, 1 Feb 2013 18:57:49 +0000 (10:57 -0800)]
Use non-breaking hyphen for "Wi-Fi"
Strings flagged with 'translatable="false"' have not been altered.
Bug:
6632800
Change-Id: I1676d3fed7d6faec6ab4ec58d851fa976df2c43a
Daniel Sandler [Wed, 30 Jan 2013 19:03:58 +0000 (14:03 -0500)]
Migrate package notification controls to AppOps.
We still show the [X] Show Notifications box in
InstalledAppDetails for now, however the information should
be mostly in sync with the AppOps screen. ("Mostly" because
there's no way to register for changes to AppOp modes at
present.)
Change-Id: Ia5cdda26c140aed8ee7329caaeedac04b8cbd8f1
Daniel Sandler [Fri, 1 Feb 2013 14:43:38 +0000 (14:43 +0000)]
Merge "Fix bugs with null AppOp permissions."
Daniel Sandler [Thu, 31 Jan 2013 20:22:51 +0000 (15:22 -0500)]
Fix bugs with null AppOp permissions.
Change-Id: I9f199d4f5843fbba374ced8206902098811b3786
Svetoslav [Thu, 31 Jan 2013 03:17:06 +0000 (03:17 +0000)]
Merge "Remove "enhance web scripts" from settings."
Baligh Uddin [Wed, 30 Jan 2013 18:43:41 +0000 (10:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia4458289713f2e9f6c47882d2f2e99d36f6e2aec
Auto-generated-cl: translation import
Dianne Hackborn [Tue, 29 Jan 2013 23:22:22 +0000 (15:22 -0800)]
Improve resetting of application state.
We now reset preferred apps to our defaults, instead of
just clearing everything out.
Change-Id: I70f713ce62b2ffb2d7f6a8e056978847734c27f7
Svetoslav [Tue, 29 Jan 2013 10:16:41 +0000 (02:16 -0800)]
Remove "enhance web scripts" from settings.
See change Ic125514c34f191aea0416a469e4b3481ab3200b9 for details.
bug:
8089372
Change-Id: I47eda16579c29051aa24b8d4c38035439aa00915
Russell Brenner [Mon, 28 Jan 2013 19:35:55 +0000 (19:35 +0000)]
Merge "Revert "Use non-breaking hyphen for "Wi-Fi"""
Russell Brenner [Mon, 28 Jan 2013 19:33:40 +0000 (19:33 +0000)]
Revert "Use non-breaking hyphen for "Wi-Fi""
This reverts commit
6a98b9bf58b0715713834d75028b3c21a6d92a43
Change-Id: Ia4168462988e37f3470c510453c31c73ed63ab7b
Baligh Uddin [Mon, 28 Jan 2013 19:32:19 +0000 (19:32 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Mon, 28 Jan 2013 19:32:01 +0000 (19:32 +0000)]
Revert "Import translations. DO NOT MERGE"
broken build.
This reverts commit
3e93c29207e96387b367b18f47663972b2000e6b
Change-Id: Ib1f8d64f12add5ffbf1a777d22525fc55e226bc3
Russell Brenner [Sat, 19 Jan 2013 00:36:06 +0000 (16:36 -0800)]
Use non-breaking hyphen for "Wi-Fi"
Bug:
6632800
Change-Id: I5838a16ffce10ae6df4b2b5fd504b43124b6de3e
Baligh Uddin [Mon, 28 Jan 2013 18:33:40 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Mon, 28 Jan 2013 16:46:49 +0000 (16:46 +0000)]
Merge "Follow UX design guideline for frequency band"
Baligh Uddin [Mon, 28 Jan 2013 16:44:57 +0000 (08:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib27a3e53b1691361731f0a1b02d9f529cdd5f71a
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 26 Jan 2013 01:11:42 +0000 (17:11 -0800)]
am
bbf8daf4: am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Android Git Automerger (1) and others
* commit '
bbf8daf4602b62d806c4946196b526edbe08e056':
Fix of Settings application sort crash
Irfan Sheriff [Sat, 26 Jan 2013 01:11:31 +0000 (17:11 -0800)]
am
61b0f8c8: am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Android Git Automerger (1) and others
* commit '
61b0f8c88ab6c8254230aa7953bf619934d7d756':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Fri, 25 Jan 2013 22:37:20 +0000 (14:37 -0800)]
Follow UX design guideline for frequency band
Bug:
8019331
Change-Id: Ib87f4200ed42730d06485e339dc67cbb870b0538
Dianne Hackborn [Fri, 25 Jan 2013 03:14:26 +0000 (19:14 -0800)]
App ops: add UI for viewing and controlling ops per-app.
Change-Id: Iadd68cbd429af4d431dcd09b9adacd09c5092ae6
Dianne Hackborn [Fri, 25 Jan 2013 01:09:13 +0000 (17:09 -0800)]
am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
505232be07e388c602529e14254df013637b16f2':
Fix of Settings application sort crash
Dianne Hackborn [Fri, 25 Jan 2013 01:02:58 +0000 (01:02 +0000)]
Merge "Fix of Settings application sort crash"
Irfan Sheriff [Thu, 24 Jan 2013 19:30:12 +0000 (11:30 -0800)]
am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
b1ea6805d98bf953448db350ae33e53c3c3b797d':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Thu, 24 Jan 2013 18:50:05 +0000 (18:50 +0000)]
Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Dianne Hackborn [Wed, 23 Jan 2013 22:45:27 +0000 (22:45 +0000)]
Merge "Handle new "disabled until used" mode."
Baligh Uddin [Wed, 23 Jan 2013 19:34:51 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia36273d69a924d49f94116887962252c942d0042
Auto-generated-cl: translation import
Venkataraman Nerellapalli [Wed, 22 Feb 2012 09:12:46 +0000 (14:42 +0530)]
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.
Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a
Benoit Goby [Sat, 22 Dec 2012 00:43:20 +0000 (16:43 -0800)]
Settings: Add setting to clear adb public keys
Change-Id: I1d5ab7a83a3b7b23f0cd51305d965f45793eb853
Dianne Hackborn [Wed, 23 Jan 2013 01:17:25 +0000 (17:17 -0800)]
Handle new "disabled until used" mode.
We want these apps to still show up as normal apps,
not look like they have been disabled completely (entirely
gone) or by the user (listed separately as disabled).
Change-Id: Ib58ead274a74c6df3ee87c8db5f7d0652e37b9bd
Baligh Uddin [Wed, 23 Jan 2013 00:58:48 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Wed, 23 Jan 2013 00:25:15 +0000 (16:25 -0800)]
am
a6c51f3d: am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:20:28 +0000 (16:20 -0800)]
am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
7b8b6618219a2a9e1402858b513cf19628033204':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:09:51 +0000 (00:09 +0000)]
Merge "Fix for battery temperature display"
Irfan Sheriff [Tue, 22 Jan 2013 23:23:57 +0000 (15:23 -0800)]
am
814db19c: am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
814db19c4631dba3c60ac807771be4bf04c20880':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 23:12:22 +0000 (15:12 -0800)]
am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
67995f973dd524ba20983b9246a17a10746c4590':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 22:58:19 +0000 (22:58 +0000)]
Merge "Fix for F/C in WifiConfigInfo"
Baligh Uddin [Tue, 22 Jan 2013 17:27:15 +0000 (09:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5386ba5861b8c9b623bd6031d936474ad457ca1f
Auto-generated-cl: translation import
Elliott Hughes [Tue, 22 Jan 2013 16:03:32 +0000 (08:03 -0800)]
am
d7d5b33b: am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
d7d5b33bcd78680d475c92fca7bafc4ac4279621':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:58:42 +0000 (07:58 -0800)]
am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
375b6d985be9203fb221eb42810e586e196c34f8':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:43:05 +0000 (15:43 +0000)]
Merge "Force closed at settings application when delete Misc files"
Jia Arlan [Fri, 11 May 2012 08:27:07 +0000 (16:27 +0800)]
Fix of Settings application sort crash
The original implementation of compareTo function
will sometimes cause crash when the power usage list
above 32 items.
When comparing double values a proper comparison method
needs to be used. Using just subtraction does not take
into account NaN:S, infinities and +/-0 numbers. In certain
cirtumstances it seems that using subtraction causes
compareTo to return values that is not expected by the
sorting code and causes an illegal argument exception with
"Comparison method violates its general contract!".
This problem only happens if the sort code is called arrays
containing more than 32 (currently) due to how
ComparableTimSort works (call chain is Collections.sort ->
Arrays.sort(Object[]) -> ComparableTimSort.
Change-Id: If732f04797a3c8b2a43568c90bb73a1ec69a4c98
Irfan Sheriff [Sat, 19 Jan 2013 18:16:35 +0000 (18:16 +0000)]
Merge "Allow only valid EAP configs"
Shuhrat Dehkanov [Sat, 19 Jan 2013 12:50:06 +0000 (21:50 +0900)]
Fix for F/C in WifiConfigInfo
1. Turn off Wi-Fi
2. Open the dialer and input *#*#4636#*#*
3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately,
Settings has stopped" dialog.
Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
ikbae.kim [Fri, 18 Jan 2013 00:29:55 +0000 (16:29 -0800)]
Fix for battery temperature display
Centi temperature under zero degree is displayed with '-' sign.
Fix this using absolute value in centi degree display.
Change-Id: If4958d9c75c03d1f3ecfd14436fc80dc2fd57860
Dianne Hackborn [Fri, 18 Jan 2013 18:52:38 +0000 (10:52 -0800)]
Improve app ops UI.
Merge app entries together some.
Also a little weekend present for swetland.
Change-Id: Ie2b6654d9de0b9eeaafbf4b070845353c130b9c1
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.
Allow only support configs for various EAP methods
Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
Predrag Stanojevic [Tue, 15 May 2012 13:01:02 +0000 (15:01 +0200)]
Force closed at settings application when delete Misc files
NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.
Change-Id: I13aac19949826b385610fd1fee2befb411684023
Chris Craik [Thu, 17 Jan 2013 23:45:33 +0000 (23:45 +0000)]
Merge "Remove now obsolete tracing options"
Chris Craik [Thu, 17 Jan 2013 19:23:48 +0000 (11:23 -0800)]
Remove now obsolete tracing options
Change-Id: I8bd79161e0cb88619e2713b18c5f94cc1a12cb87
Russell Brenner [Thu, 17 Jan 2013 18:05:43 +0000 (18:05 +0000)]
Merge "Stop hijacking strings from Setup Wizard"
Russell Brenner [Thu, 17 Jan 2013 18:05:12 +0000 (18:05 +0000)]
Merge "Revised text for skipping wifi"
Fabrice Di Meglio [Thu, 17 Jan 2013 16:33:25 +0000 (16:33 +0000)]
Merge "Fix Switches padding for Settings app"
Dianne Hackborn [Thu, 17 Jan 2013 02:52:17 +0000 (02:52 +0000)]
Merge "Show all apps that can perform an op."
Dianne Hackborn [Thu, 17 Jan 2013 02:49:48 +0000 (18:49 -0800)]
Show all apps that can perform an op.
Change-Id: Ic4c6fdbc5b345c890a2f41a00b4b5c11272702d7
Amith Yamasani [Wed, 16 Jan 2013 23:28:05 +0000 (23:28 +0000)]
Merge "Use bindServiceAsUser() to follow API change."
Russell Brenner [Wed, 16 Jan 2013 22:39:43 +0000 (14:39 -0800)]
Stop hijacking strings from Setup Wizard
Some UX behavior was moved from Setup Wizard to Wi-Fi Settings after
the localization deadline, so the existing string resources were
leveraged by way of their msgid attributes. In most cases, the
original strings are no longer needed in Setup Wizard and are being
removed from there in a separate CL.
Bug:
8020975
Change-Id: Ibd7625c7335ed3c8823b637a452585f5c70e965a
Russell Brenner [Wed, 16 Jan 2013 22:17:26 +0000 (14:17 -0800)]
Revised text for skipping wifi
Also stopped using msgid's for these two strings from SetupWizard,
which was done to repurpose existing strings after the localization
deadline.
Bug:
7350454
Change-Id: I575937b4fa5d15a6cac4c9cb60cf2d8741c7f774
Amith Yamasani [Wed, 16 Jan 2013 20:34:16 +0000 (12:34 -0800)]
Use bindServiceAsUser() to follow API change.
Change-Id: Ib12f1dcf7f3a5df7e166b732e1c29e7e9d0869ed
Dianne Hackborn [Wed, 16 Jan 2013 03:02:05 +0000 (19:02 -0800)]
Quick and dirty UI for viewing app op information.
Change-Id: If17bfbe84cf438ca9bb37bf446564f39de99cee1
Fabrice Di Meglio [Wed, 16 Jan 2013 02:54:11 +0000 (18:54 -0800)]
Fix Switches padding for Settings app
- use setPaddingRelative() instead of setPadding()
Change-Id: Ifd14193a5f60d303035b394616dc65a70e1ef5f9
Baligh Uddin [Tue, 15 Jan 2013 17:33:31 +0000 (09:33 -0800)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Tue, 15 Jan 2013 17:03:20 +0000 (09:03 -0800)]
Merge "Update enterprise API usage"
Baligh Uddin [Tue, 15 Jan 2013 02:03:58 +0000 (18:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I520b61f5ffc00be86776506400bfa59019f999c8
Auto-generated-cl: translation import
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
Jeff Sharkey [Sat, 12 Jan 2013 22:17:38 +0000 (14:17 -0800)]
Merge "Invert split action bar logic."
Jeff Brown [Sat, 12 Jan 2013 00:01:29 +0000 (16:01 -0800)]
Merge "Support wifi display settings on tablets."
Jeff Brown [Fri, 11 Jan 2013 23:29:27 +0000 (15:29 -0800)]
Support wifi display settings on tablets.
Bug:
7612891
Change-Id: Ie1268f97e4c28cd9a321a966cd6952bd2a9bc281
Fabrice Di Meglio [Fri, 11 Jan 2013 19:16:40 +0000 (11:16 -0800)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
Jeff Sharkey [Wed, 28 Nov 2012 00:42:27 +0000 (16:42 -0800)]
Invert split action bar logic.
The majority of Settings activities don't want split action bars, so
invert the logic to be opt-in instead of opt-out.
Bug:
7545845
Change-Id: I794f6df911dda61904e02a0f6b917ab92c846293
Fabrice Di Meglio [Fri, 11 Jan 2013 19:11:00 +0000 (11:11 -0800)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- mirror more icons: avatar for multi user. brightness, cellphone, network signal, language,
application, wifi lock, phone call
Change-Id: Ida6d3ce898a49e7fb88545b84c5171106fce4e9d
Romain Guy [Fri, 11 Jan 2013 02:41:40 +0000 (18:41 -0800)]
Merge "Add new profiling graph type"
Romain Guy [Fri, 11 Jan 2013 02:39:12 +0000 (18:39 -0800)]
Add new profiling graph type
Change-Id: I37945e7668174f62545a8c8fb96e0ee68751a24e
Fabrice Di Meglio [Fri, 11 Jan 2013 00:46:38 +0000 (16:46 -0800)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
Fabrice Di Meglio [Thu, 10 Jan 2013 22:09:16 +0000 (14:09 -0800)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- mirror sound icon
Change-Id: Id0104b0662c90f516af159982611114572794651
Baligh Uddin [Wed, 9 Jan 2013 19:45:34 +0000 (11:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I982475662504037faf32a1f3a035aca38e45f782
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Jan 2013 17:52:13 +0000 (09:52 -0800)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Mon, 7 Jan 2013 23:20:51 +0000 (15:20 -0800)]
Merge "Allow underscore in proxy hostnames"
Irfan Sheriff [Mon, 7 Jan 2013 22:23:07 +0000 (14:23 -0800)]
Allow underscore in proxy hostnames
Some proxies use underscore and we should allow configuring them
Change-Id: I6b4eeac7d486ff1eb10cc14cee5ef36db0f9e278
Romain Guy [Mon, 7 Jan 2013 19:20:49 +0000 (11:20 -0800)]
Change "track frame time property" to a list preference
The preference can now be used to disable GPU profiling, expose
profiling data to dumpsys gfxinfo or display that data on screen.
Change-Id: Ib77e9695445fae4a7419667716e92bcc196437df
Baligh Uddin [Mon, 7 Jan 2013 18:15:55 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I717baee570b22b75416ebe012654e432c706ccd4
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Jan 2013 21:44:46 +0000 (13:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23a0fe1f0bc3f044d2f028a621cb1070bcecb5fa
Auto-generated-cl: translation import
Amith Yamasani [Tue, 18 Dec 2012 17:32:22 +0000 (09:32 -0800)]
Refresh battery stats when the battery state or charge level changes.
This will keep them in sync. We still don't automatically update
the stats periodically, in case the user is investigating some
behavior. That's why we have a refresh button.
Bug:
7737824
Change-Id: I8a59cad6c72f540533b3526fc476260465c73492
Elliott Hughes [Thu, 20 Dec 2012 19:06:47 +0000 (11:06 -0800)]
am
52d623ed: am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
52d623ede4a697259b1b3506b0464941e376218e':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 19:03:50 +0000 (11:03 -0800)]
am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 00:11:15 +0000 (16:11 -0800)]
Merge "Correct check box visibility in Display / Brightness"
Jeff Sharkey [Wed, 19 Dec 2012 01:44:05 +0000 (17:44 -0800)]
One final pass at unquoted NetworkPolicies.
Correctly shows the metered status of legacy policies in UI.
Bug:
7695807
Change-Id: I13c9f4c1716d8457343c41433afac0b5f00e02fe
Jeff Sharkey [Wed, 19 Dec 2012 01:32:10 +0000 (17:32 -0800)]
Clean up oddly quoted NetworkPolicies.
Bug:
7695807
Change-Id: Ia3f04dc3e918d6ca4af62f263a9c90273b3485ff
Jeff Sharkey [Wed, 19 Dec 2012 01:06:23 +0000 (17:06 -0800)]
Fix metered SSID matching regression.
WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.
Bug:
7695807
Change-Id: I53c0361f9e44b4d47ec8764991a3cd545c253edd
The Android Open Source Project [Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)]
am
a6dd202d: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
a6dd202da14c2a0e75ea03807458f5c8cd319888':
The Android Open Source Project [Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
Benn Porscke [Wed, 17 Oct 2012 17:01:11 +0000 (19:01 +0200)]
Correct check box visibility in Display / Brightness
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.
Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
The Android Automerger [Tue, 18 Dec 2012 04:49:51 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jean Chalard [Mon, 17 Dec 2012 18:48:11 +0000 (10:48 -0800)]
am
5031683a: am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
5031683a729917ae45047bfc33b7f89705c4c530':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:46:29 +0000 (10:46 -0800)]
am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
d0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:44:36 +0000 (10:44 -0800)]
am
a374d816: Distinguish adding an already present word / cancelling
* commit '
a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
OSDN Git Service
