Chris Craik
87c3ce7667
Remove now obsolete tracing options
...
Change-Id: I8bd79161e0cb88619e2713b18c5f94cc1a12cb87
2013-01-17 11:41:22 -08:00
Russell Brenner
7961b05e58
Merge "Stop hijacking strings from Setup Wizard"
2013-01-17 18:05:43 +00:00
Russell Brenner
f3e6c611be
Merge "Revised text for skipping wifi"
2013-01-17 18:05:12 +00:00
Fabrice Di Meglio
fd50438e8e
Merge "Fix Switches padding for Settings app"
2013-01-17 16:33:25 +00:00
Dianne Hackborn
b791c4b11d
Merge "Show all apps that can perform an op."
2013-01-17 02:52:17 +00:00
Dianne Hackborn
228df665d4
Show all apps that can perform an op.
...
Change-Id: Ic4c6fdbc5b345c890a2f41a00b4b5c11272702d7
2013-01-16 18:49:48 -08:00
Amith Yamasani
486d1ac237
Merge "Use bindServiceAsUser() to follow API change."
2013-01-16 23:28:06 +00:00
Russell Brenner
a70688feac
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
2013-01-16 14:39:43 -08:00
Russell Brenner
18f91756b1
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
2013-01-16 14:17:26 -08:00
Amith Yamasani
3f9c9b6eae
Use bindServiceAsUser() to follow API change.
...
Change-Id: Ib12f1dcf7f3a5df7e166b732e1c29e7e9d0869ed
2013-01-16 12:34:16 -08:00
Dianne Hackborn
a522a8ef82
Quick and dirty UI for viewing app op information.
...
Change-Id: If17bfbe84cf438ca9bb37bf446564f39de99cee1
2013-01-15 19:20:19 -08:00
Fabrice Di Meglio
b27223f139
Fix Switches padding for Settings app
...
- use setPaddingRelative() instead of setPadding()
Change-Id: Ifd14193a5f60d303035b394616dc65a70e1ef5f9
2013-01-15 18:54:11 -08:00
Baligh Uddin
6001a7b0d4
Merge "Import translations. DO NOT MERGE"
2013-01-15 09:33:31 -08:00
Irfan Sheriff
adf4926a97
Merge "Update enterprise API usage"
2013-01-15 09:03:20 -08:00
Baligh Uddin
557a7b61ee
Import translations. DO NOT MERGE
...
Change-Id: I520b61f5ffc00be86776506400bfa59019f999c8
Auto-generated-cl: translation import
2013-01-14 18:03:58 -08:00
Irfan Sheriff
de11bcec8d
Update enterprise API usage
...
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
2013-01-14 14:45:16 -08:00
Jeff Sharkey
4b5728bbfb
Merge "Invert split action bar logic."
2013-01-12 14:17:38 -08:00
Jeff Brown
602ebd18a2
Merge "Support wifi display settings on tablets."
2013-01-11 16:01:30 -08:00
Jeff Brown
e428e02f16
Support wifi display settings on tablets.
...
Bug: 7612891
Change-Id: Ie1268f97e4c28cd9a321a966cd6952bd2a9bc281
2013-01-11 15:29:27 -08:00
Fabrice Di Meglio
e635e39b3d
Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
2013-01-11 11:16:41 -08:00
Jeff Sharkey
cc0d26bb14
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
2013-01-11 11:16:31 -08:00
Fabrice Di Meglio
ca322c1356
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
2013-01-11 11:15:42 -08:00
Romain Guy
9c79dea53d
Merge "Add new profiling graph type"
2013-01-10 18:41:40 -08:00
Romain Guy
7bc89a9a61
Add new profiling graph type
...
Change-Id: I37945e7668174f62545a8c8fb96e0ee68751a24e
2013-01-10 18:39:12 -08:00
Fabrice Di Meglio
6826f3b67a
Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)"
2013-01-10 16:46:39 -08:00
Fabrice Di Meglio
d07142eb7f
Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
...
- mirror sound icon
Change-Id: Id0104b0662c90f516af159982611114572794651
2013-01-10 14:09:16 -08:00
Baligh Uddin
0c13c64a63
Import translations. DO NOT MERGE
...
Change-Id: I982475662504037faf32a1f3a035aca38e45f782
Auto-generated-cl: translation import
2013-01-09 11:45:34 -08:00
Baligh Uddin
c876f4a324
Merge "Import translations. DO NOT MERGE"
2013-01-08 09:52:14 -08:00
Irfan Sheriff
1ec14c18d7
Merge "Allow underscore in proxy hostnames"
2013-01-07 15:20:51 -08:00
Irfan Sheriff
61298b3fda
Allow underscore in proxy hostnames
...
Some proxies use underscore and we should allow configuring them
Change-Id: I6b4eeac7d486ff1eb10cc14cee5ef36db0f9e278
2013-01-07 15:03:15 -08:00
Romain Guy
70618480d9
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
2013-01-07 11:25:10 -08:00
Baligh Uddin
19e1fd97e1
Import translations. DO NOT MERGE
...
Change-Id: I717baee570b22b75416ebe012654e432c706ccd4
Auto-generated-cl: translation import
2013-01-07 10:15:55 -08:00
Baligh Uddin
ae2a22db7f
Import translations. DO NOT MERGE
...
Change-Id: I23a0fe1f0bc3f044d2f028a621cb1070bcecb5fa
Auto-generated-cl: translation import
2013-01-02 13:44:46 -08:00
Amith Yamasani
8f716f66cf
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
2012-12-26 08:41:25 -08:00
Elliott Hughes
c611de2dca
am 52d623ed
: am f141594c
: Merge "Correct check box visibility in Display / Brightness"
...
* commit '52d623ede4a697259b1b3506b0464941e376218e':
Correct check box visibility in Display / Brightness
2012-12-20 11:06:47 -08:00
Elliott Hughes
52d623ede4
am f141594c
: Merge "Correct check box visibility in Display / Brightness"
...
* commit 'f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
2012-12-20 11:03:50 -08:00
Elliott Hughes
f141594c05
Merge "Correct check box visibility in Display / Brightness"
2012-12-19 16:11:15 -08:00
Jeff Sharkey
d54d34557a
One final pass at unquoted NetworkPolicies.
...
Correctly shows the metered status of legacy policies in UI.
Bug: 7695807
Change-Id: I13c9f4c1716d8457343c41433afac0b5f00e02fe
2012-12-18 18:07:31 -08:00
Jeff Sharkey
53f2855808
Clean up oddly quoted NetworkPolicies.
...
Bug: 7695807
Change-Id: Ia3f04dc3e918d6ca4af62f263a9c90273b3485ff
2012-12-18 17:32:10 -08:00
Jeff Sharkey
a66c0ab094
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
2012-12-18 17:06:23 -08:00
The Android Open Source Project
17653f566d
am a6dd202d
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'a6dd202da14c2a0e75ea03807458f5c8cd319888':
2012-12-18 09:46:45 -08:00
The Android Open Source Project
a6dd202da1
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
2012-12-18 09:44:44 -08:00
Benn Porscke
106cf669c1
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 >
2012-12-18 10:38:41 +01:00
The Android Automerger
29a4eb7a33
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-17 20:49:51 -08:00
Jean Chalard
eaac5df7bc
am 5031683a
: am d0a9d5b6
: am a374d816
: Distinguish adding an already present word / cancelling
...
* commit '5031683a729917ae45047bfc33b7f89705c4c530':
Distinguish adding an already present word / cancelling
2012-12-17 10:48:11 -08:00
Jean Chalard
5031683a72
am d0a9d5b6
: am a374d816
: Distinguish adding an already present word / cancelling
...
* commit 'd0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
2012-12-17 10:46:29 -08:00
Jean Chalard
d0a9d5b6e0
am a374d816
: Distinguish adding an already present word / cancelling
...
* commit 'a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
2012-12-17 10:44:36 -08:00
Jean Chalard
a374d81605
Distinguish adding an already present word / cancelling
...
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
2012-12-17 15:52:07 +09:00
The Android Open Source Project
2370685553
am aca1bb4a
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'aca1bb4ab86f3b27df72db37cab6bc3ccca088a9':
2012-12-14 16:48:47 -08:00
The Android Open Source Project
aca1bb4ab8
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
2012-12-14 14:03:38 -08:00