OSDN Git Service
Amith Yamasani [Fri, 14 Sep 2012 01:06:49 +0000 (18:06 -0700)]
Watch for profile changes and push to user manager
If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.
Also use an async task to load the profile data.
Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f
Dianne Hackborn [Thu, 13 Sep 2012 17:36:13 +0000 (10:36 -0700)]
Merge "Multi-user battery settings." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 08:31:46 +0000 (01:31 -0700)]
Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 01:41:25 +0000 (18:41 -0700)]
Iteration on multi-user Storage UI.
Now that DefaultContainerService has visibility of external storage
for all users, we can measure internal storage in a single pass.
Internal storage measurement now iterates across all known users,
counting both apps and emulated storage usage.
Create MeasurementDetails object with documentation about what is
counted under various device configurations. Generalize to measure
each Environment.DIRECTORY separately, so it can be combined as
needed. General cleanup of how measurements are passed to UI.
Bug:
7003520
Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
Dianne Hackborn [Thu, 13 Sep 2012 00:02:23 +0000 (17:02 -0700)]
Multi-user battery settings.
Aggregates battery use from other users into one line item.
Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
Christopher Tate [Wed, 12 Sep 2012 22:41:41 +0000 (15:41 -0700)]
Merge "Don't crash during setup of secondary users" into jb-mr1-dev
Amith Yamasani [Wed, 12 Sep 2012 00:04:10 +0000 (17:04 -0700)]
Tell contacts to return back to Settings when done editing the profile info
Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
Christopher Tate [Wed, 12 Sep 2012 21:30:35 +0000 (14:30 -0700)]
Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev
Christopher Tate [Wed, 12 Sep 2012 21:27:43 +0000 (14:27 -0700)]
Don't crash during setup of secondary users
Make sure to call super.onActivityCreated() even in the short-circuit
case where there's an early 'return'. This has probably been broken
for a long time but was never exercised while bringing up a new-from-
scratch device, but is the usual code path now for secondary users.
Change-Id: I0c1a5116440908d65750133689507917307e1dcd
Christopher Tate [Wed, 12 Sep 2012 21:25:46 +0000 (14:25 -0700)]
Correct settings namespace for auto time/tz
Bug
7148283
Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
Fabrice Di Meglio [Wed, 12 Sep 2012 20:26:22 +0000 (13:26 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Jeff Sharkey [Tue, 11 Sep 2012 22:45:19 +0000 (15:45 -0700)]
Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.
Mostly changes so Storage doesn't crash; will take another UI
iteration pass soon.
Bug:
7131382
Change-Id: If7ec807f12a36eb8ed02a0fb94e8a0b3a6694f16
Fabrice Di Meglio [Wed, 12 Sep 2012 01:01:38 +0000 (18:01 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix Data Usage text direction for list items
Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
Fabrice Di Meglio [Wed, 12 Sep 2012 00:13:53 +0000 (17:13 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Fabrice Di Meglio [Tue, 11 Sep 2012 22:17:40 +0000 (15:17 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix "Network SSID" string direction
Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
Christopher Tate [Tue, 11 Sep 2012 21:59:59 +0000 (14:59 -0700)]
Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
Christopher Tate [Tue, 11 Sep 2012 21:53:25 +0000 (14:53 -0700)]
Wifi settings are in a different namespace now
Bug
7144874
Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
Martijn Coenen [Tue, 11 Sep 2012 21:43:57 +0000 (14:43 -0700)]
Merge "Fix on/off switch for Android Beam." into jb-mr1-dev
Martijn Coenen [Tue, 11 Sep 2012 21:32:30 +0000 (14:32 -0700)]
Fix on/off switch for Android Beam.
Bug:
7121720
Change-Id: Iec0f9ccfd439d11cfcc13afb45974ce1fd8778f0
Amith Yamasani [Tue, 11 Sep 2012 18:01:35 +0000 (11:01 -0700)]
Check the user limit before showing an ADD menu item
Change-Id: I0c5cffa149bfbf6824273b7180db55e1fe313021
Elliott Hughes [Tue, 11 Sep 2012 02:08:34 +0000 (19:08 -0700)]
am
ebca7f3e: am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
ebca7f3e8e54391e33a5fa656cb96a0dfb2d3732':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:07:16 +0000 (19:07 -0700)]
am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
6aeed7846c5f428c56268d92b437679d683fed4a':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:05:37 +0000 (19:05 -0700)]
am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
f587f5a54d4717c8f147ce46979f65f9301cd81d':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:03:46 +0000 (19:03 -0700)]
am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
78f5c4d5372e38b5a5d1e2f3e3b732951a76f007':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:02:47 +0000 (19:02 -0700)]
am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
Fix /proc/version parsing in Settings.
Michael Jurka [Tue, 11 Sep 2012 01:27:29 +0000 (18:27 -0700)]
am
43a5c62c: am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
43a5c62ceb856dbc4ace1f85dfed276216217c8b':
Fix color of text in widget picker
Michael Jurka [Tue, 11 Sep 2012 01:24:46 +0000 (18:24 -0700)]
am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
Fix color of text in widget picker
Amith Yamasani [Tue, 11 Sep 2012 01:23:05 +0000 (18:23 -0700)]
am
4e201cc6: am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0':
User management UI: take 2
Michael Jurka [Tue, 11 Sep 2012 01:22:10 +0000 (18:22 -0700)]
Merge "Fix color of text in widget picker" into jb-mr1-dev
Amith Yamasani [Tue, 11 Sep 2012 01:20:23 +0000 (18:20 -0700)]
am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
Amith Yamasani [Tue, 11 Sep 2012 01:18:06 +0000 (18:18 -0700)]
Merge "User management UI: take 2" into jb-mr1-dev
Amith Yamasani [Fri, 7 Sep 2012 01:04:06 +0000 (18:04 -0700)]
User management UI: take 2
Single screen user management, also visible on secondary users.
Work in progress, especially with respect to synchronizing with
the Me profile.
Change-Id: Id6e94a85d53356847e4e019c52e3388de9ecb354
Michael Jurka [Tue, 11 Sep 2012 01:13:19 +0000 (18:13 -0700)]
Fix color of text in widget picker
Elliott Hughes [Tue, 11 Sep 2012 01:02:38 +0000 (18:02 -0700)]
Merge "Fix /proc/version parsing in Settings."
Elliott Hughes [Thu, 6 Sep 2012 21:12:31 +0000 (14:12 -0700)]
Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
Christopher Tate [Tue, 11 Sep 2012 00:25:15 +0000 (17:25 -0700)]
am
3c76c467: am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
3c76c467632194bc8bd4b8b69273ca4b5edf312d':
Update Settings app to use new namespace for airplane-mode settings
Christopher Tate [Tue, 11 Sep 2012 00:18:33 +0000 (17:18 -0700)]
am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
6a5929b086a61a955a4a2f43f5fa251e8754ff4a':
Update Settings app to use new namespace for airplane-mode settings
Baligh Uddin [Tue, 11 Sep 2012 00:16:02 +0000 (17:16 -0700)]
am
8f113624: (-s ours) am
955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
8f1136241df1544df54e653b007ca96da98ebae6':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Sep 2012 00:15:46 +0000 (17:15 -0700)]
am
dd3f01af: (-s ours) am
6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
dd3f01afc3836b9955273f75a5d5fb63798be77f':
Import translations. DO NOT MERGE
John Spurlock [Tue, 11 Sep 2012 00:15:36 +0000 (17:15 -0700)]
am
e42e895d: am
f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
* commit '
e42e895d9cedc83b5a2c4a86e20e6a34613f3332':
Dream Settings: Disable settings icon if not selected.
Matthew Xie [Tue, 11 Sep 2012 00:15:25 +0000 (17:15 -0700)]
am
206f87c5: am
cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
* commit '
206f87c5b99c5653b83ba55682ab4dd622fbfe6c':
Fix NPE in bluetooth Permission Activity
Matthew Xie [Tue, 11 Sep 2012 00:15:12 +0000 (17:15 -0700)]
am
5b0e875d: am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
5b0e875d2d50d5a805028f495262fcbab9773c11':
Fixed the display count of connected panu device.
rich cannings [Tue, 11 Sep 2012 00:11:56 +0000 (17:11 -0700)]
am
32cf21c9: am
bfbdceff: Grey out App Check setting when no verifiers exist
* commit '
32cf21c9b9000238d69870cada23d45233d11670':
Grey out App Check setting when no verifiers exist
rich cannings [Tue, 11 Sep 2012 00:10:34 +0000 (17:10 -0700)]
am
e6195a12: am
1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
* commit '
e6195a12edac8e32c9176771b36b64915498706d':
Add package verification to settings app
Jeff Brown [Tue, 11 Sep 2012 00:10:15 +0000 (17:10 -0700)]
am
b35bdfe9: am
eda43176: Enable auto-brightness adjustment feature with system prop.
* commit '
b35bdfe9540b2e296fad57820d2b9ad7504532f9':
Enable auto-brightness adjustment feature with system prop.
Svetoslav Ganov [Tue, 11 Sep 2012 00:08:44 +0000 (17:08 -0700)]
am
54ae7e51: am
d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
* commit '
54ae7e51a8a675e4ab4d671e19099f74502aba81':
Settings for the screen magnification feature.
Christopher Tate [Tue, 11 Sep 2012 00:06:45 +0000 (17:06 -0700)]
am
7b251126: am
6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
* commit '
7b2511260f3782d656e8712cf69edd9bf88a150b':
Update Settings app to manipulate now-global settings properly
Jeff Sharkey [Tue, 11 Sep 2012 00:06:09 +0000 (17:06 -0700)]
am
20ec00d3: am
04df8b77: Iteration on multi-user storage UI.
* commit '
20ec00d3e8681f57cdfe465a907c3fc705b05772':
Iteration on multi-user storage UI.
Christopher Tate [Mon, 10 Sep 2012 22:39:05 +0000 (15:39 -0700)]
Update Settings app to use new namespace for airplane-mode settings
Bug
7132230
Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
Baligh Uddin [Mon, 10 Sep 2012 21:29:41 +0000 (14:29 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken Build.
This reverts commit
e88b7faf434ef1ddecf341e6c3470bc055610bb7
Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076
Baligh Uddin [Mon, 10 Sep 2012 21:26:59 +0000 (14:26 -0700)]
am
955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
955f3477a910f56132f341f6679c9157b0cd515c':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 10 Sep 2012 21:24:57 +0000 (14:24 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Mon, 10 Sep 2012 21:24:29 +0000 (14:24 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken build.
This reverts commit
d5babab623512cb7c9d27ee10af2702272c64aa6
Change-Id: Ia088b9bb3471c943276a435bd5c749c45125a19d
Baligh Uddin [Mon, 10 Sep 2012 21:03:49 +0000 (14:03 -0700)]
am
6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6ac5ace7f04c550b9ce6427762f30eb901d05f1f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 10 Sep 2012 21:01:42 +0000 (14:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
John Spurlock [Mon, 10 Sep 2012 20:37:28 +0000 (13:37 -0700)]
am
f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
* commit '
f217f18d5e806f73ca572db14d8e3373a0027dbd':
Dream Settings: Disable settings icon if not selected.
John Spurlock [Mon, 10 Sep 2012 20:35:39 +0000 (13:35 -0700)]
Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
Matthew Xie [Mon, 10 Sep 2012 19:55:27 +0000 (12:55 -0700)]
am
cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
* commit '
cce52bd3a5162326493e4374c9ddc4f333351da7':
Fix NPE in bluetooth Permission Activity
Matthew Xie [Mon, 10 Sep 2012 19:53:51 +0000 (12:53 -0700)]
Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
Ganesh Ganapathi Batta [Mon, 10 Sep 2012 18:13:54 +0000 (11:13 -0700)]
Fix NPE in bluetooth Permission Activity
This fixes a NPE by ensuring that cached device list has
a cached device associated with a given BDA before accessing
the cached device
Bug:
5964529
Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
Baligh Uddin [Mon, 10 Sep 2012 19:19:07 +0000 (12:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibeb05d837712dbbc9c7728faa7f745ad4f37dcc3
Auto-generated-cl: translation import
John Spurlock [Mon, 10 Sep 2012 19:17:10 +0000 (15:17 -0400)]
Dream Settings: Disable settings icon if not selected.
Bug:
7129176
Change-Id: I6ceb6b7bd37032197ab3777901156c9424cbc301
Baligh Uddin [Mon, 10 Sep 2012 19:15:47 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86ce438ad7821460d932824b63aa196c77e61f56
Auto-generated-cl: translation import
Matthew Xie [Mon, 10 Sep 2012 19:06:51 +0000 (12:06 -0700)]
am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
de101033025c53ab8f16c31c57c003c757e47cec':
Fixed the display count of connected panu device.
Matthew Xie [Mon, 10 Sep 2012 19:05:19 +0000 (12:05 -0700)]
Merge "Fixed the display count of connected panu device." into jb-mr1-dev
zzy [Sat, 8 Sep 2012 00:33:59 +0000 (17:33 -0700)]
Fixed the display count of connected panu device.
Root cause: Bluez relies on the count of activated pan network
interfaces to show how many panu devices are connected. But
Bluedroid has only one shared pan network interface for any
number of connected panu devices.
Change-Id: I52e3d6d79e2f1b9f8afab1d70c9ff1eca3ef2349
rich cannings [Sun, 9 Sep 2012 21:39:32 +0000 (14:39 -0700)]
am
bfbdceff: Grey out App Check setting when no verifiers exist
* commit '
bfbdceffe60e20a8db91b54cc81cfe49ea0dd96a':
Grey out App Check setting when no verifiers exist
rich cannings [Sun, 9 Sep 2012 19:48:50 +0000 (12:48 -0700)]
Grey out App Check setting when no verifiers exist
Bug:
7082362
Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
rich cannings [Sun, 9 Sep 2012 05:18:51 +0000 (22:18 -0700)]
am
1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
* commit '
1352c142a33d0c3ad8ed0f58bbc1d6ce7158cb55':
Add package verification to settings app
rich cannings [Sun, 9 Sep 2012 05:17:10 +0000 (22:17 -0700)]
Merge "Add package verification to settings app" into jb-mr1-dev
Jeff Brown [Sat, 8 Sep 2012 22:56:27 +0000 (15:56 -0700)]
am
eda43176: Enable auto-brightness adjustment feature with system prop.
* commit '
eda43176e3f1fd7dcdd481e4e759c62450f96c88':
Enable auto-brightness adjustment feature with system prop.
Jeff Brown [Sat, 8 Sep 2012 22:12:19 +0000 (15:12 -0700)]
Enable auto-brightness adjustment feature with system prop.
This feature is experimental and disabled by default.
Change-Id: I9c3c77d6d207ceec65e0babc7915db8d439d5da2
rich cannings [Fri, 7 Sep 2012 20:20:44 +0000 (13:20 -0700)]
Add package verification to settings app
Adds a dialog/toggle in security settings to turn package verification on and
off.
Bug:
7082362
Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
Svetoslav Ganov [Fri, 7 Sep 2012 23:22:47 +0000 (16:22 -0700)]
am
d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
* commit '
d4b711e60361a2a05ffa11a4199cceea54d3ea96':
Settings for the screen magnification feature.
Svetoslav Ganov [Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Merge "Settings for the screen magnification feature." into jb-mr1-dev
Svetoslav Ganov [Mon, 6 Aug 2012 17:55:11 +0000 (10:55 -0700)]
Settings for the screen magnification feature.
1. Screen magnification on the device has to he explicitly enabled
by the user before allowing a global gesture related interactions.
The feature toggle setting is in Settings->Accessibility and it
is a separate screen with instructions how to use the feature
and a toggle switch.
2. Added a setting in developer options for toggling the magnification
auto update feature. If this features is on the screen is zoomed
out or rotation or activity start. Also if the feature is enabled
the magnified viewport will scroll to show popped up windows.
bug:
5587727
Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
Christopher Tate [Fri, 7 Sep 2012 21:38:56 +0000 (14:38 -0700)]
am
6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
* commit '
6c0841412e3ddf03d7b9ad56e398a20f6b6cf3fd':
Update Settings app to manipulate now-global settings properly
Christopher Tate [Fri, 7 Sep 2012 21:37:03 +0000 (14:37 -0700)]
Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
Christopher Tate [Fri, 7 Sep 2012 20:35:31 +0000 (13:35 -0700)]
Update Settings app to manipulate now-global settings properly
Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
Jeff Sharkey [Fri, 7 Sep 2012 20:26:56 +0000 (13:26 -0700)]
am
04df8b77: Iteration on multi-user storage UI.
* commit '
04df8b77a40c06488a954a22cc5be638179b7747':
Iteration on multi-user storage UI.
Jeff Sharkey [Fri, 7 Sep 2012 20:23:47 +0000 (13:23 -0700)]
Iteration on multi-user storage UI.
Adds headers to distinguish between current and other users. Also
correctly orders color chips.
Bug:
7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
Jeff Sharkey [Fri, 7 Sep 2012 06:26:15 +0000 (23:26 -0700)]
am
e8d2ae5f: am
96c2f8c5: Progress towards split storage categories.
* commit '
e8d2ae5f175bdca0eedf44c0207740678102bb46':
Progress towards split storage categories.
Jeff Sharkey [Fri, 7 Sep 2012 06:24:53 +0000 (23:24 -0700)]
am
96c2f8c5: Progress towards split storage categories.
* commit '
96c2f8c50865e823e710be4d92f1589f978f03c2':
Progress towards split storage categories.
Jeff Sharkey [Fri, 7 Sep 2012 05:46:21 +0000 (22:46 -0700)]
Progress towards split storage categories.
Cleans up StorageVolumePreferenceCategory creation, and uses new
isPrimary() API instead of passing around hacky "i == 0" derived
value.
Bug:
7003520
Change-Id: I9eb7164035b5368ee795e35b22e750aebbf3b159
Elliott Hughes [Thu, 6 Sep 2012 23:45:38 +0000 (16:45 -0700)]
am
07e5c690: am
88220b72: am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
07e5c69010853c6c94cd27ac2c92516b83883ab2':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:43:46 +0000 (16:43 -0700)]
am
0c0d6052: am
105d879c: am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
0c0d605231e78c3a883b88b4abbc46ee29a7a194':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:43:26 +0000 (16:43 -0700)]
am
88220b72: am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
88220b72044392f0cbfecb24c84e6a63e82be25c':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:41:35 +0000 (16:41 -0700)]
am
105d879c: am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
105d879ccef2517a07a15f29b956be739504fa73':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:41:16 +0000 (16:41 -0700)]
am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:40:09 +0000 (16:40 -0700)]
am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:39:41 +0000 (16:39 -0700)]
am
98d9380a: am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:38:37 +0000 (16:38 -0700)]
am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
cfbc61de3f94a620153ca83a790e4d1b03a9078e':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)]
am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)]
resolved conflicts for merge of
33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
Elliott Hughes [Thu, 6 Sep 2012 22:50:10 +0000 (15:50 -0700)]
Merge "Stop using getDSTSavings."
Elliott Hughes [Thu, 6 Sep 2012 22:30:51 +0000 (15:30 -0700)]
Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.
Bug:
6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
Elliott Hughes [Thu, 6 Sep 2012 22:29:46 +0000 (15:29 -0700)]
Merge "Stop hard-coding sample 12- and 24-hour times."
Elliott Hughes [Thu, 6 Sep 2012 21:49:35 +0000 (14:49 -0700)]
Stop hard-coding sample 12- and 24-hour times.
Bug:
6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
Baligh Uddin [Thu, 6 Sep 2012 18:19:02 +0000 (11:19 -0700)]
am
2c705626: (-s ours) am
d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
2c705626e5cfa29adddb0f82fca261560d4fd9a8':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 6 Sep 2012 18:17:39 +0000 (11:17 -0700)]
am
d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
d4e216bc9eb9b8aecd031a5f3c2a412857333a99':
Revert "Import translations. DO NOT MERGE"