Commit Graph

11946 Commits

Author SHA1 Message Date
Amith Yamasani
328acd4491 am 658e6807: am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev
* commit '658e6807aebb451721c413c0becd1ac0fd3bbfcc':
  Exit restrictions fragment if user was deleted
2013-10-04 13:34:44 -07:00
Vinit Deshapnde
a4a679ae70 am 2337e472: am db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
* commit '2337e472d6bfd4cb8812a9cdfb5fa66b728b1693':
  Fix EAP-TLS reconnect after reboot issue
2013-10-04 13:34:01 -07:00
Amith Yamasani
658e6807ae am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev
* commit '16d358daf00b54c2ecfe5f5b8de8de5a8cfa14ef':
  Exit restrictions fragment if user was deleted
2013-10-04 12:56:37 -07:00
Amith Yamasani
16d358daf0 Merge "Exit restrictions fragment if user was deleted" into klp-dev 2013-10-04 19:55:18 +00:00
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
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
2274bb53cf Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-03 03:58:40 +00: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
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
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
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
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
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
1b0a71197f am 1b881bcc: Merge "Show appropriate empty state if not printers are found." into klp-dev
* commit '1b881bcc4181c240007a1d6d7a3e224b4f018933':
  Show appropriate empty state if not printers are found.
2013-10-01 22:21:57 -07:00
Svetoslav
9d0c0b2fec am 033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
* commit '033b5739ba85fca62a8e74a6620c9a14cc9f3f5e':
  Remove Google Play specific search URIs from Settings.
2013-10-01 22:21:37 -07:00
David Braun
d5b60019b2 Default SMS app setting should still be shown even if SIM is removed.
Change-Id: Ia7bd7b690a2637999b96438667ebd4e4bed96051
2013-10-01 17:10:46 -07:00
Svetoslav Ganov
ff75201aee Merge "Missing return statement if a print job is no longer present." into klp-dev 2013-10-01 21:30:36 +00:00
Lifu Tang
c120c6cf9f Fixed crash when rotating screen
- Fix b/11006855

Change-Id: I406727ca4260aae006e6128835f05f5f2ed9c1a3
2013-10-01 13:02:32 -07:00
Lifu Tang
5ab9fa432d Renamed "App settings" back to "Location services"
- Fix b/10610559

Change-Id: Id98a1b4e8d04238f371322fe6232647fa13b5c4a
2013-10-01 12:29:17 -07:00
Lifu Tang
c6578818d8 Merge "Make recent location app list package based" into klp-dev 2013-10-01 19:04:00 +00:00
Alon Albert
394b80ce5b Merge "Hide Camera in CryptKeeper" into klp-dev 2013-10-01 16:01:52 +00:00
Lifu Tang
5cbf971e19 Make recent location app list package based
- Link all items to app info pages instead of battery page

- Fix b/10855516

Change-Id: I241e81b179f468364b324ae714964fc3253cd2c9
2013-10-01 08:55:29 -07:00
Maggie Benthall
490e072c84 Merge "UX tweaks for CA cert monitoring" into klp-dev 2013-10-01 15:45:25 +00:00
The Android Automerger
030b6b287d merge in klp-release history after reset to klp-dev 2013-10-01 06:01:31 -07:00
Jim Miller
3e82dff1a1 am 277827fb: Merge "Disable keyguard widgets on low memory devices" into klp-dev
* commit '277827fb27957af41837d785647e94b3956f2bba':
  Disable keyguard widgets on low memory devices
2013-10-01 05:26:44 -07:00
David Christie
d0217f0f88 am 7cdb34f5: Merge "Change location settings "Device sensors" to "Device only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint
* commit '7cdb34f50eb2c786998b4af943d49bb091b249cd':
  Change location settings "Device sensors" to "Device only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI.
2013-10-01 05:26:44 -07:00
Martijn Coenen
e1f522ad4b am 028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev
* commit '028b6b3f7cc79587a42583351e2c032f71e7ac8c':
  Don't show tap&pay if NFC is off.
2013-10-01 05:26:08 -07:00
Matthew Xie
c9320341e4 am 3b2fbe2f: Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
* commit '3b2fbe2fb374c8b825b716b372d1c46fdc610bfa':
  Add Bluetooth Privileged permission to use pairing apis
2013-10-01 05:26:07 -07:00
Svetoslav Ganov
dc00bf6483 Missing return statement if a print job is no longer present.
bug:11012251

Change-Id: I2ea925d903571aa676e4c48d78b4c0c6a91d7af1
2013-10-01 00:23:51 -07:00