git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Zhihai Xu [Fri, 18 Oct 2013 18:54:03 +0000 (11:54 -0700)]

am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

* commit '55f03857b7ebe7663cf4873d059afced15e30081':
BT keeps on asking me if I want to allow car to do stuff

commit | commitdiff | tree

Zhihai Xu [Fri, 18 Oct 2013 18:51:16 +0000 (18:51 +0000)]

Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

commit | commitdiff | tree

Satoshi Kataoka [Fri, 18 Oct 2013 18:18:29 +0000 (11:18 -0700)]

am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume

* commit 'ea90cd2fca08e5c65e54d8df1c208337e08fc541':
Do not merge. Refresh "InputMethodPreference"s onResume

commit | commitdiff | tree

Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]

Do not merge. Refresh "InputMethodPreference"s onResume

Corresponding change is I015075d57ebed94d6b

Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7

commit | commitdiff | tree

Zhihai Xu [Fri, 18 Oct 2013 00:11:38 +0000 (17:11 -0700)]

BT keeps on asking me if I want to allow car to do stuff

Persist the "no" count
bug:11176511

Change-Id: I39674334fe8bf09d1f3f2b07c12513a6c46f053b

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 21:31:54 +0000 (14:31 -0700)]

am 2496a32c: (-s ours) Import translations. DO NOT MERGE

* commit '2496a32ca67270e5570f97b780ae47aade080e0d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 21:21:57 +0000 (14:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:25:29 +0000 (10:25 -0700)]

am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '025b6ecff220b3117b892df1d9f4bd35a4fb4527':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 17:21:34 +0000 (17:21 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Oct 2013 06:13:11 +0000 (23:13 -0700)]

Import translations. DO NOT MERGE

Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import

commit | commitdiff | tree

Zhihai Xu [Thu, 17 Oct 2013 02:29:49 +0000 (19:29 -0700)]

am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

* commit '3f90a454480c227e58300f8c6fb88cc022ff237e':
BT keeps on asking me if I want to allow car to do stuff

commit | commitdiff | tree

Zhihai Xu [Thu, 17 Oct 2013 02:27:10 +0000 (02:27 +0000)]

Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

commit | commitdiff | tree

Ed Heyl [Thu, 17 Oct 2013 00:52:06 +0000 (17:52 -0700)]

am 67390aad: merge in klp-release (no-op)

* commit '67390aad4f8a091dc14ea825ede292f8a52efb47':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.

commit | commitdiff | tree

Ed Heyl [Thu, 17 Oct 2013 00:46:24 +0000 (17:46 -0700)]

merge in klp-release (no-op)

commit | commitdiff | tree

Christopher Tate [Wed, 16 Oct 2013 20:41:43 +0000 (13:41 -0700)]

am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

* commit '235e5d686fc73cfd82605bac86dcc9673916c5b7':
User ID, not uid, in an EXTRA_USER_HANDLE

commit | commitdiff | tree

Christopher Tate [Wed, 16 Oct 2013 20:24:36 +0000 (13:24 -0700)]

User ID, not uid, in an EXTRA_USER_HANDLE

Bug 11208808

Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9

commit | commitdiff | tree

Zhihai Xu [Tue, 15 Oct 2013 18:27:54 +0000 (11:27 -0700)]

BT keeps on asking me if I want to allow car to do stuff

remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:11176511

Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316

commit | commitdiff | tree

The Android Automerger [Tue, 15 Oct 2013 13:01:17 +0000 (06:01 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Torne (Richard Coles) [Tue, 15 Oct 2013 10:34:15 +0000 (03:34 -0700)]

am f88e5442: Merge "Remove experimental WebView setting." into klp-dev

* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
Remove experimental WebView setting.

commit | commitdiff | tree

Torne (Richard Coles) [Tue, 15 Oct 2013 10:31:46 +0000 (10:31 +0000)]

Merge "Remove experimental WebView setting." into klp-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 15 Oct 2013 00:19:28 +0000 (17:19 -0700)]

am 740702ce: (-s ours) Import translations. DO NOT MERGE

* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 14 Oct 2013 22:24:56 +0000 (15:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 14 Oct 2013 16:35:43 +0000 (17:35 +0100)]

Remove experimental WebView setting.

The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87

commit | commitdiff | tree

The Android Automerger [Sun, 13 Oct 2013 13:02:42 +0000 (06:02 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 12 Oct 2013 13:43:48 +0000 (06:43 -0700)]

am 37473121: (-s ours) Import translations. DO NOT MERGE

* commit '37473121937ad62b616e849e21954cf39583e465':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 12 Oct 2013 07:56:01 +0000 (00:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 22:01:27 +0000 (15:01 -0700)]

am 9c861f80: (-s ours) Import translations. DO NOT MERGE

* commit '9c861f80a2f87d007c7bce7493a154d33702f785':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 21:51:44 +0000 (14:51 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 21:47:56 +0000 (14:47 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import

commit | commitdiff | tree

Zhihai Xu [Fri, 11 Oct 2013 21:06:13 +0000 (14:06 -0700)]

am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

* commit '83936d967d0e880401843161feda649c5bd96bc1':
BT keeps on asking me if I want to allow car to do stuff

commit | commitdiff | tree

Zhihai Xu [Fri, 11 Oct 2013 21:02:51 +0000 (21:02 +0000)]

Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

commit | commitdiff | tree

Zhihai Xu [Fri, 11 Oct 2013 19:15:19 +0000 (12:15 -0700)]

BT keeps on asking me if I want to allow car to do stuff

We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.

bug:11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f

commit | commitdiff | tree

Dianne Hackborn [Fri, 11 Oct 2013 18:59:51 +0000 (11:59 -0700)]

am b1e33884: Allow tapping on memory status regions to filter proc stats.

* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
Allow tapping on memory status regions to filter proc stats.

commit | commitdiff | tree

Dianne Hackborn [Fri, 11 Oct 2013 18:50:34 +0000 (11:50 -0700)]

Allow tapping on memory status regions to filter proc stats.

Change-Id: Iade56907df648a95600919578154635c49ac9dce

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 15:27:19 +0000 (08:27 -0700)]

am 6e96aff5: (-s ours) Import translations. DO NOT MERGE

* commit '6e96aff5546f02199cf4c8aba0bae132d7d35e43':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 08:17:11 +0000 (01:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Fri, 11 Oct 2013 08:12:20 +0000 (01:12 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import

commit | commitdiff | tree

David Christie [Thu, 10 Oct 2013 22:39:06 +0000 (15:39 -0700)]

am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev

* commit '6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
Change location settings icons from crosshair to pin -b/8142654

commit | commitdiff | tree

David Christie [Thu, 10 Oct 2013 22:28:31 +0000 (22:28 +0000)]

Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev

commit | commitdiff | tree

Svetoslav [Thu, 10 Oct 2013 17:14:27 +0000 (10:14 -0700)]

am d9f156dd: Coalescing multiple print job notifications (Settings)

* commit 'd9f156ddf072775c894db1ca3c3fe8989be4dbeb':
Coalescing multiple print job notifications (Settings)

commit | commitdiff | tree

The Android Automerger [Thu, 10 Oct 2013 13:01:39 +0000 (06:01 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Svetoslav [Thu, 10 Oct 2013 04:59:04 +0000 (21:59 -0700)]

Coalescing multiple print job notifications (Settings)

We used to show a single notificaiton for every print job but
this is against th UX guidelines. Since we have to lead by
example, this change adds coalescing of multiple notifications.

bug:11155212

Change-Id: I865450495e7e85bd6620c1f42aeef07d2f83a01a

commit | commitdiff | tree

Alan Viverette [Wed, 9 Oct 2013 20:29:08 +0000 (13:29 -0700)]

am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev

* commit '16ad57483d7bba6f5c05ffd64431a900c400eff5':
Fix caption settings picker layouts

commit | commitdiff | tree

Alan Viverette [Wed, 9 Oct 2013 20:25:09 +0000 (20:25 +0000)]

Merge "Fix caption settings picker layouts" into klp-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 9 Oct 2013 19:18:10 +0000 (12:18 -0700)]

am 02099910: Fix issue #11033002: Percentages in proc stats details are not rounded correctly

* commit '020999103b34860a89576cd5dba862009337e9a9':
Fix issue #11033002: Percentages in proc stats details are not rounded correctly

commit | commitdiff | tree

Dianne Hackborn [Wed, 9 Oct 2013 19:06:59 +0000 (12:06 -0700)]

Fix issue #11033002: Percentages in proc stats details are not rounded correctly

Use round instead of ceil. Also, when showing services from multiple packages,
sort the package categories by the duration of the longest running service in
each, so that the more important ones come first.

Change-Id: I42b47b0522cd786a1c4ee5b59a549ec7c0c6ffe1

commit | commitdiff | tree

David Christie [Mon, 7 Oct 2013 23:35:18 +0000 (16:35 -0700)]

Change location settings icons from crosshair to pin
-b/8142654

Change-Id: I4c0b6aeb56a9a100c2869032bb09dc11cc66dcea

commit | commitdiff | tree

The Android Automerger [Wed, 9 Oct 2013 13:01:57 +0000 (06:01 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Lifu Tang [Wed, 9 Oct 2013 04:32:08 +0000 (21:32 -0700)]

am 8a4c53ac: Limits the broadcast to system apps only

* commit '8a4c53ac2bbd2eca81a8725212d4d61672fbfdef':
Limits the broadcast to system apps only

commit | commitdiff | tree

Lifu Tang [Tue, 8 Oct 2013 23:23:52 +0000 (16:23 -0700)]

Limits the broadcast to system apps only

- Part of b/10974059

Change-Id: I1f0b6eeece88a2ee29b76636b9ce58dcc3d71aad

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 23:09:39 +0000 (16:09 -0700)]

am d8154590: merge in KFS78N (no-op)

* commit 'd8154590d5062598db8067c460aff54cbe49dd9e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 23:02:00 +0000 (16:02 -0700)]

merge in KFS78N (no-op)

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 22:47:50 +0000 (15:47 -0700)]

am cfa55e16: merge in KQS81M

* commit 'cfa55e164b78c8b150cab82345c1c5be01f69c90':
  Import translations. DO NOT MERGE
  Print settings polish
  Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix bug when sharing to bluetooth.
  Fix for TTS settings crash.
  Restriction pin changes.
  Remove Restrictions UI
  Add some missing fragments to the whitelist
  Potential fix for Settings instability on x-large.
  Fix accidental creation of restriction entry for required apps
  Fix broken strings in Settings
  Always allow formatting of physical storage.
  Guard against missing terminal app.

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 22:43:09 +0000 (15:43 -0700)]

merge in KQS81M

commit | commitdiff | tree

Alan Viverette [Tue, 8 Oct 2013 22:33:00 +0000 (15:33 -0700)]

Fix caption settings picker layouts

BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd

commit | commitdiff | tree

Svetoslav [Tue, 8 Oct 2013 21:32:20 +0000 (14:32 -0700)]

am 31962228: Merge "Fix a crash in the print service settigns." into klp-dev

* commit '31962228aa0230272950e88cf635f0576e0bad67':
Fix a crash in the print service settigns.

commit | commitdiff | tree

Svetoslav [Tue, 8 Oct 2013 21:28:22 +0000 (21:28 +0000)]

Merge "Fix a crash in the print service settigns." into klp-dev

commit | commitdiff | tree

Christopher Tate [Tue, 8 Oct 2013 21:23:22 +0000 (14:23 -0700)]

am eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev

* commit 'eff0927df2515662a263fb79a5a060d81273a36b':
Once we decide to show Home settings, keep it shown forever

commit | commitdiff | tree

Christopher Tate [Tue, 8 Oct 2013 21:20:13 +0000 (21:20 +0000)]

Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev

commit | commitdiff | tree

Svetoslav [Tue, 8 Oct 2013 19:08:14 +0000 (12:08 -0700)]

Fix a crash in the print service settigns.

When the search view is attached and detached we announce that
for accessibility. The trouble is that if the activity is being
torn down we are trying to access resources from a fragment that
is detached and the qcrash occurs. This change does not try to
access resources if the activity is finishing and also we do not
load resource strings if accessibility is not enabled.

bug:11127814

Change-Id: If3e97b6e94687775386a43c8fa54fd45140306eb

commit | commitdiff | tree

Lifu Tang [Tue, 8 Oct 2013 18:53:27 +0000 (11:53 -0700)]

am 1673fbc0: Broadcasting a message for mode changing

* commit '1673fbc029d569b6424914db48e571b52091b4fc':
Broadcasting a message for mode changing

commit | commitdiff | tree

Christopher Tate [Tue, 8 Oct 2013 18:30:19 +0000 (11:30 -0700)]

Once we decide to show Home settings, keep it shown forever

Principle of Least Surprise FTW.

Bug 11131794

Change-Id: I1df720fa86fb870aa74a5d0074ca966843317f12

commit | commitdiff | tree

Lifu Tang [Tue, 8 Oct 2013 09:24:17 +0000 (02:24 -0700)]

Broadcasting a message for mode changing

- Fix b/10974059

Change-Id: I219ea35e65a36af9f041a487dd8039bb5e2f048b

commit | commitdiff | tree

The Android Automerger [Tue, 8 Oct 2013 13:01:34 +0000 (06:01 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 03:51:30 +0000 (20:51 -0700)]

am 1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1955bf1bb3147a06d1856ac002f8cd5aab4f535e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 03:49:34 +0000 (03:49 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 03:49:14 +0000 (03:49 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 02:02:02 +0000 (19:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 01:55:29 +0000 (18:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import

commit | commitdiff | tree

Chris Wren [Mon, 7 Oct 2013 20:06:45 +0000 (13:06 -0700)]

am a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev

* commit 'a50f78515e2718fa5e47f283e25705806bd163aa':
Hide Camera in CryptKeeperConfirm

commit | commitdiff | tree

Chris Wren [Mon, 7 Oct 2013 20:01:35 +0000 (20:01 +0000)]

Merge "Hide Camera in CryptKeeperConfirm" into klp-dev

commit | commitdiff | tree

David Braun [Mon, 7 Oct 2013 18:13:22 +0000 (11:13 -0700)]

am 1c17255d: Block "SMS Default Dialog" on non-phone devices

* commit '1c17255d5edadaf1790af365d2ed5f962a7bcc65':
Block "SMS Default Dialog" on non-phone devices

commit | commitdiff | tree

David Braun [Mon, 7 Oct 2013 16:35:52 +0000 (09:35 -0700)]

Block "SMS Default Dialog" on non-phone devices

This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)

Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1

commit | commitdiff | tree

Chris Wren [Mon, 7 Oct 2013 05:11:08 +0000 (01:11 -0400)]

Hide Camera in CryptKeeperConfirm

Bug: 10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77

commit | commitdiff | tree

The Android Automerger [Sun, 6 Oct 2013 13:02:07 +0000 (06:02 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 03:41:16 +0000 (20:41 -0700)]

am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8aecb7cea083366fc85d8088d7e5e18e775fee80':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 03:38:17 +0000 (03:38 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 03:37:53 +0000 (03:37 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 01:44:36 +0000 (18:44 -0700)]

Import translations. DO NOT MERGE

Change-Id: I6da7d93122a4b4b00a05fbabb5170b935610dfc2
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 01:40:44 +0000 (18:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: I97e1bf2ace031bcf591507987bd5d6ae9c6160fd
Auto-generated-cl: translation import

commit | commitdiff | tree

Svetoslav [Sat, 5 Oct 2013 01:02:19 +0000 (18:02 -0700)]

am 9379d935: Make printers for a print service not react to press.

* commit '9379d935552118e33ccee5aa8383d8f86bdff113':
Make printers for a print service not react to press.

commit | commitdiff | tree

Svetoslav [Sat, 5 Oct 2013 00:52:36 +0000 (17:52 -0700)]

Make printers for a print service not react to press.

We show a list of printers for the a print service in the
print service settings activity. This list is there to
inform the user of which printers are available and
optionally offers adding a printer affordance. The printer
list items do nothing so they should not react to press
and create a false impression they do.

bug:10983508

Change-Id: I43b19ebb0acf6662c489826c192fd6daf8ad103d

commit | commitdiff | tree

Ari Sachter-Zeltzer [Fri, 4 Oct 2013 21:21:36 +0000 (14:21 -0700)]

updated launcher settings icon to gray gear

fixes b/10788190

Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa

commit | commitdiff | tree

Amith Yamasani [Fri, 4 Oct 2013 23:00:44 +0000 (16:00 -0700)]

am 4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev

* commit '4a4a1b8b96dd01aacfd82f189d5222baf9eafba9':
Use a public media content uri for viewing local media files

commit | commitdiff | tree

Amith Yamasani [Fri, 4 Oct 2013 22:58:05 +0000 (22:58 +0000)]

Merge "Use a public media content uri for viewing local media files" into klp-dev

commit | commitdiff | tree

Ari Sachter-Zeltzer [Fri, 4 Oct 2013 22:53:50 +0000 (15:53 -0700)]

am 0a9d037b: updated launcher settings icon to gray gear

* commit '0a9d037bed992adda30da67e95b8cad1904f954c':
updated launcher settings icon to gray gear

commit | commitdiff | tree

Amith Yamasani [Fri, 4 Oct 2013 21:27:21 +0000 (14:27 -0700)]

Use a public media content uri for viewing local media files

Bug: 11061566
Change-Id: I7e049f48d37a68a0a41b7a62383eea71f3938c44

commit | commitdiff | tree

Ari Sachter-Zeltzer [Fri, 4 Oct 2013 21:21:36 +0000 (14:21 -0700)]

updated launcher settings icon to gray gear

fixes b/10788190

Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa

commit | commitdiff | tree

Amith Yamasani [Fri, 4 Oct 2013 19:56:37 +0000 (12:56 -0700)]

am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev

* commit '16d358daf00b54c2ecfe5f5b8de8de5a8cfa14ef':
Exit restrictions fragment if user was deleted

commit | commitdiff | tree

Amith Yamasani [Fri, 4 Oct 2013 19:55:18 +0000 (19:55 +0000)]

Merge "Exit restrictions fragment if user was deleted" into klp-dev

commit | commitdiff | tree

Vinit Deshapnde [Fri, 4 Oct 2013 19:02:19 +0000 (12:02 -0700)]

am db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev

* commit 'db750e8f2cd20aa09875dfd54656df11e27151bf':
Fix EAP-TLS reconnect after reboot issue

commit | commitdiff | tree

Vinit Deshapnde [Fri, 4 Oct 2013 18:20:41 +0000 (18:20 +0000)]

Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev

commit | commitdiff | tree

Amith Yamasani [Wed, 2 Oct 2013 00:09:32 +0000 (17:09 -0700)]

Exit restrictions fragment if user was deleted

When resuming the restricted user fragment, make sure that the user still
exists, as it may have been deleted by the restricted user.

Bug: 11010340

Change-Id: I3360dbc42586c5bb28013844f8c788e641ad8b6a

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 19:19:12 +0000 (12:19 -0700)]

am 2274bb53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2274bb53cf9aa2e131ebbd9d0517d57436c31c36':
Import translations. DO NOT MERGE

commit | commitdiff | tree

The Android Automerger [Thu, 3 Oct 2013 13:02:53 +0000 (06:02 -0700)]

merge in klp-release history after reset to klp-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 03:58:40 +0000 (03:58 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 2 Oct 2013 23:51:24 +0000 (16:51 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ice51de6939fa0e1c759ad7b76f3bc2392d64f57e
Auto-generated-cl: translation import

commit | commitdiff | tree

Svetoslav [Wed, 2 Oct 2013 23:48:07 +0000 (23:48 +0000)]

Merge "Polish print settings accessibility." into klp-dev