Vinit Deshapnde
2337e472d6
am db750e8f
: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
...
* commit 'db750e8f2cd20aa09875dfd54656df11e27151bf':
Fix EAP-TLS reconnect after reboot issue
2013-10-04 12:02:19 -07:00
Vinit Deshapnde
db750e8f2c
Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
2013-10-04 18:20:42 +00:00
Baligh Uddin
60f0154091
am 155fc0ff
: (-s ours) am b3334e77
: (-s ours) am 2274bb53
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '155fc0ff6bb1259f78d105065ee3dee463e5e9f8':
Import translations. DO NOT MERGE
2013-10-04 11:09:14 -07:00
Amith Yamasani
38e7610512
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
2013-10-03 16:08:56 -07:00
Baligh Uddin
155fc0ff6b
am b3334e77
: (-s ours) am 2274bb53
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'b3334e77a25cb3a62bb6b9554bf120fc82c80f8d':
Import translations. DO NOT MERGE
2013-10-03 15:40:38 -07:00
Baligh Uddin
b3334e77a2
am 2274bb53
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2274bb53cf9aa2e131ebbd9d0517d57436c31c36':
Import translations. DO NOT MERGE
2013-10-03 12:19:12 -07:00
The Android Automerger
fdb1da00cb
merge in klp-release history after reset to klp-dev
2013-10-03 06:02:53 -07:00
Baligh Uddin
1d5aa02043
Merge "Import translations. DO NOT MERGE"
2013-10-03 03:58:49 +00:00
Baligh Uddin
2274bb53cf
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-03 03:58:40 +00:00
Svetoslav
b4463e650b
Fix settings title
...
Change-Id: I203c577693700ef60197800632e8c33bc552ef5f
2013-10-02 18:37:13 -07:00
Svetoslav
41bda1911c
am e60a06b0
: (-s ours) am 672b845e
: Merge "Polish print settings accessibility." into klp-dev
...
* commit 'e60a06b0e750e5dfa5a011c5863a385d314203c4':
Polish print settings accessibility.
2013-10-02 18:24:25 -07:00
Baligh Uddin
87f6d34065
Import translations. DO NOT MERGE
...
Change-Id: I7a577c09972f5771ef6639fb8e8b417493ad8535
Auto-generated-cl: translation import
2013-10-02 16:55:39 -07:00
Svetoslav
e60a06b0e7
am 672b845e
: Merge "Polish print settings accessibility." into klp-dev
...
* commit '672b845eec350cc03402f5961f56ac47a5dac220':
Polish print settings accessibility.
2013-10-02 16:55:27 -07:00
Baligh Uddin
1cc4766d3b
Import translations. DO NOT MERGE
...
Change-Id: Ice51de6939fa0e1c759ad7b76f3bc2392d64f57e
Auto-generated-cl: translation import
2013-10-02 16:51:24 -07:00
Svetoslav
672b845eec
Merge "Polish print settings accessibility." into klp-dev
2013-10-02 23:48:07 +00:00
Alan Viverette
394a517982
Merge "Add accessibility display adjustments to Settings"
2013-10-02 23:39:38 +00:00
Alan Viverette
fc0ab213b8
Add accessibility display adjustments to Settings
...
This will be redesigned soon, but for now it allows access to quick
setting tiles for testing display adjustments.
BUG: 9057596
Change-Id: I4b760487b2fe0a336b188930306000e5dfc01951
2013-10-02 16:36:33 -07:00
Christopher Tate
99a7145607
am 73f5f2aa
: am e7358028
: Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
...
* commit '73f5f2aac9a3731be1cfc8f0267c19df876fcfe6':
Back out of Home settings when penultimate home app is uninstalled
2013-10-02 15:18:22 -07:00
Svetoslav
24e49f0613
Polish print settings accessibility.
...
bug:10983508
Change-Id: I986e28a2cd8e52b7c8422e825de9174d6e2377c3
2013-10-02 15:16:16 -07:00
Christopher Tate
73f5f2aac9
am e7358028
: Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
...
* commit 'e7358028d10f87d0499e3d85abf699824882b9e2':
Back out of Home settings when penultimate home app is uninstalled
2013-10-02 15:16:02 -07:00
Lifu Tang
e639d2969c
am a310b638
: am 3846b539
: Merge "Modified suggestion string for battery-saving mode" into klp-dev
...
* commit 'a310b6382dd4f80af27a0d8673ee5cae270ff4ad':
Modified suggestion string for battery-saving mode
2013-10-02 15:12:28 -07:00
Christopher Tate
e7358028d1
Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev
2013-10-02 22:11:50 +00:00
Lifu Tang
a310b6382d
am 3846b539
: Merge "Modified suggestion string for battery-saving mode" into klp-dev
...
* commit '3846b5393820c96b96e0e0922f71514aaa8a2eee':
Modified suggestion string for battery-saving mode
2013-10-02 15:09:36 -07:00
Lifu Tang
3846b53938
Merge "Modified suggestion string for battery-saving mode" into klp-dev
2013-10-02 22:03:39 +00:00
Amith Yamasani
548f31715b
Load account type icons in a background thread before scrolling down
...
This reduces the jank when scrolling down in top-level Settings if you
happen to have several account types like Google, Twitter, Facebook, etc.
In the process of doing this, discovered that headers get built even when
they're not showing (SubSettings). Skip setting up the headers, which can
be expensive when there are several accounts.
Bug: 11006601
Change-Id: I8b4eafdcc2fc2beecac01317c3c8f07a82febcc0
2013-10-02 14:44:45 -07:00
Amith Yamasani
92cd1af094
am 3f60d8d3
: am d462e868
: Merge "Load account type icons in a background thread before scrolling down" into klp-dev
...
* commit '3f60d8d395545f11b63a936cf776f6ab6bae953b':
Load account type icons in a background thread before scrolling down
2013-10-02 14:31:10 -07:00
David Braun
b12973f95f
am fdbb26c8
: am 6e5956eb
: Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
...
* commit 'fdbb26c8af09054e515784b15c258812da888fca':
Default SMS app setting should still be shown even if SIM is removed.
2013-10-02 14:31:10 -07:00
Amith Yamasani
3f60d8d395
am d462e868
: Merge "Load account type icons in a background thread before scrolling down" into klp-dev
...
* commit 'd462e8686697094161930c76a648f75e8c6afd92':
Load account type icons in a background thread before scrolling down
2013-10-02 14:29:39 -07:00
David Braun
fdbb26c8af
am 6e5956eb
: Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
...
* commit '6e5956ebe2b9c3d06ea463bba5c864dad58e0c02':
Default SMS app setting should still be shown even if SIM is removed.
2013-10-02 14:29:39 -07:00
Lifu Tang
b581a08f9f
Modified suggestion string for battery-saving mode
...
- Fix b/11009797
Change-Id: I55a890348ec2d3ec79956306b65e58449d88dbd3
2013-10-02 13:56:06 -07:00
Christopher Tate
e0d934fcb1
Back out of Home settings when penultimate home app is uninstalled
...
When the user deletes the last-but-one, there's nothing more that
they can do in Home settings (and we'll be suppressing it from the
top level of the Settings UI as well), so we now back out with
a dialog explaining the situation.
Bug 10918801
Change-Id: Id03169dace976f7de639e3b3ab3d50ed161258d8
2013-10-02 13:26:36 -07:00
Amith Yamasani
d462e86866
Merge "Load account type icons in a background thread before scrolling down" into klp-dev
2013-10-02 20:19:45 +00:00
David Braun
6e5956ebe2
Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev
2013-10-02 20:15:35 +00:00
Daniel Sandler
f654f192b9
Merge "Longpress any row in Status to copy text to the clipboard."
2013-10-02 19:13:08 +00:00
Amith Yamasani
2972c0136d
Load account type icons in a background thread before scrolling down
...
This reduces the jank when scrolling down in top-level Settings if you
happen to have several account types like Google, Twitter, Facebook, etc.
In the process of doing this, discovered that headers get built even when
they're not showing (SubSettings). Skip setting up the headers, which can
be expensive when there are several accounts.
Bug: 11006601
Change-Id: I8b4eafdcc2fc2beecac01317c3c8f07a82febcc0
2013-10-02 11:48:46 -07:00
Svetoslav Ganov
08f800ac98
am 1426c36f
: am ff75201a
: Merge "Missing return statement if a print job is no longer present." into klp-dev
...
* commit '1426c36ff9d377cdf843940f2ecd0bbab07a9cbb':
Missing return statement if a print job is no longer present.
2013-10-02 09:56:29 -07:00
Lifu Tang
1f7bac2ba9
am 615a6da4
: am c120c6cf
: Fixed crash when rotating screen
...
* commit '615a6da493d4f9ef4ae7d8f43d495a1272aefed8':
Fixed crash when rotating screen
2013-10-02 09:56:28 -07:00
Lifu Tang
b26bf78030
am e6e459a1
: am 5ab9fa43
: Renamed "App settings" back to "Location services"
...
* commit 'e6e459a105444b743683fd68319424be6eb3e005':
Renamed "App settings" back to "Location services"
2013-10-02 09:56:27 -07:00
Lifu Tang
1ee039ea77
am 66689fa9
: am c6578818
: Merge "Make recent location app list package based" into klp-dev
...
* commit '66689fa96429c421fcbbf08381dce7392f845814':
Make recent location app list package based
2013-10-02 09:56:27 -07:00
Alon Albert
ba68f4eaec
am c580a279
: am 394b80ce
: Merge "Hide Camera in CryptKeeper" into klp-dev
...
* commit 'c580a279a6bf5f666a876ff6a111abb3400a5831':
Hide Camera in CryptKeeper
2013-10-02 09:56:26 -07:00
Maggie Benthall
30474fd33f
am 66ef8141
: am 490e072c
: Merge "UX tweaks for CA cert monitoring" into klp-dev
...
* commit '66ef8141f38e75373940cc1666b530f944e1f56b':
UX tweaks for CA cert monitoring
2013-10-02 09:56:25 -07:00
Svetoslav Ganov
1426c36ff9
am ff75201a
: Merge "Missing return statement if a print job is no longer present." into klp-dev
...
* commit 'ff75201aee750f76372b95ff8ac08d81cb738c7c':
Missing return statement if a print job is no longer present.
2013-10-02 09:36:11 -07:00
Lifu Tang
615a6da493
am c120c6cf
: Fixed crash when rotating screen
...
* commit 'c120c6cf9f86ae56d98b2d6e22f68626b1b1665c':
Fixed crash when rotating screen
2013-10-02 09:35:43 -07:00
Lifu Tang
e6e459a105
am 5ab9fa43
: Renamed "App settings" back to "Location services"
...
* commit '5ab9fa432d17fe72c74a25770a26d405635cc0f6':
Renamed "App settings" back to "Location services"
2013-10-02 09:35:42 -07:00
Lifu Tang
66689fa964
am c6578818
: Merge "Make recent location app list package based" into klp-dev
...
* commit 'c6578818d8984a4bb5fcd2d41844fc9e8e7d7a62':
Make recent location app list package based
2013-10-02 09:35:34 -07:00
Alon Albert
c580a279a6
am 394b80ce
: Merge "Hide Camera in CryptKeeper" into klp-dev
...
* commit '394b80ce5b7f590b60200b610b3f8d5f549dbc1e':
Hide Camera in CryptKeeper
2013-10-02 09:35:07 -07:00
Maggie Benthall
66ef8141f3
am 490e072c
: Merge "UX tweaks for CA cert monitoring" into klp-dev
...
* commit '490e072c8494e59a9cf765c0451f5b445297a2f6':
UX tweaks for CA cert monitoring
2013-10-02 09:35:06 -07:00
The Android Automerger
fd3694d8b3
merge in klp-release history after reset to klp-dev
2013-10-02 06:01:41 -07:00
Svetoslav
0eba93c3f3
am 1b0a7119
: am 1b881bcc
: Merge "Show appropriate empty state if not printers are found." into klp-dev
...
* commit '1b0a71197f3629cebf4b354b6db835774b1276dc':
Show appropriate empty state if not printers are found.
2013-10-01 23:10:33 -07:00
Svetoslav
3b2fd79dc7
am 9d0c0b2f
: am 033b5739
: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
...
* commit '9d0c0b2fecc84ea6c6e156be9d87f2f6e26b012b':
Remove Google Play specific search URIs from Settings.
2013-10-01 23:10:32 -07:00