Chris Wren
cff5cca476
am 65994536
: am 98b30cea
: am a50f7851
: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
...
* commit '659945365d83bd30de5a506e9504687217393db8':
Hide Camera in CryptKeeperConfirm
2013-10-07 13:12:23 -07:00
Chris Wren
659945365d
am 98b30cea
: am a50f7851
: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
...
* commit '98b30ceaa2ef049f41907ea9672bb5f028472f1c':
Hide Camera in CryptKeeperConfirm
2013-10-07 13:09:39 -07:00
Chris Wren
a50f78515e
Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
2013-10-07 20:01:35 +00:00
David Braun
af1bf89528
am 1c2a3ad6
: am a633e1d5
: am 1c17255d
: Block "SMS Default Dialog" on non-phone devices
...
* commit '1c2a3ad6cb262447ebed557c6b1bf36bab11d59e':
Block "SMS Default Dialog" on non-phone devices
2013-10-07 11:18:09 -07:00
David Braun
1c2a3ad6cb
am a633e1d5
: am 1c17255d
: Block "SMS Default Dialog" on non-phone devices
...
* commit 'a633e1d54d28d5c646b1f99df62a9250e48340ce':
Block "SMS Default Dialog" on non-phone devices
2013-10-07 11:15:39 -07:00
David Braun
1c17255d5e
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
2013-10-07 09:35:52 -07:00
Chris Wren
0481dc7172
Hide Camera in CryptKeeperConfirm
...
Bug: 10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77
2013-10-07 01:11:08 -04:00
Svetoslav
4b23800471
am ef1cfe16
: am 32d7ea74
: am 9379d935
: Make printers for a print service not react to press.
...
* commit 'ef1cfe16fb95a8ae0e73dbd8d2f4235386be1803':
Make printers for a print service not react to press.
2013-10-04 18:08:26 -07:00
Svetoslav
ef1cfe16fb
am 32d7ea74
: am 9379d935
: Make printers for a print service not react to press.
...
* commit '32d7ea74074875b43df22369e915c177e67a0316':
Make printers for a print service not react to press.
2013-10-04 18:05:11 -07:00
Svetoslav
9379d93555
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
2013-10-04 17:52:39 -07:00
Amith Yamasani
ecb9156898
am 8f4919ff
: am b46e57ee
: am 4a4a1b8b
: Merge "Use a public media content uri for viewing local media files" into klp-dev
...
* commit '8f4919ffeb97994c5214011696945d08ca8beedb':
Use a public media content uri for viewing local media files
2013-10-04 17:36:46 -07:00
Amith Yamasani
8f4919ffeb
am b46e57ee
: am 4a4a1b8b
: Merge "Use a public media content uri for viewing local media files" into klp-dev
...
* commit 'b46e57ee261578ffb45c0b679b56b26f6dfe1208':
Use a public media content uri for viewing local media files
2013-10-04 16:03:05 -07:00
Amith Yamasani
c778bc560d
Use a public media content uri for viewing local media files
...
Bug: 11061566
Change-Id: I7e049f48d37a68a0a41b7a62383eea71f3938c44
2013-10-04 14:59:40 -07:00
Amith Yamasani
2d4a3087ec
am 328acd44
: am 658e6807
: am 16d358da
: Merge "Exit restrictions fragment if user was deleted" into klp-dev
...
* commit '328acd4491eda2a8dd19cc7d7fe3dd74064b392d':
Exit restrictions fragment if user was deleted
2013-10-04 13:40:32 -07:00
Vinit Deshapnde
5fe2760447
am a4a679ae
: am 2337e472
: am db750e8f
: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
...
* commit 'a4a679ae70a364dd4063f23abb624c6fc9aeb30f':
Fix EAP-TLS reconnect after reboot issue
2013-10-04 13:40:32 -07:00
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
16d358daf0
Merge "Exit restrictions fragment if user was deleted" into klp-dev
2013-10-04 19:55:18 +00: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
Svetoslav
b4463e650b
Fix settings title
...
Change-Id: I203c577693700ef60197800632e8c33bc552ef5f
2013-10-02 18:37:13 -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
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
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
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
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
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
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
Daniel Sandler
b771532330
Longpress any row in Status to copy text to the clipboard.
...
Really convenient for grabbing IMEI/MAC/serial/etc.
Change-Id: I30dd6109d76f342108b10571cf043158b09743d0
2013-10-02 04:17:32 +00: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