David Christie
6d6d497610
Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
2013-10-10 22:28:31 +00:00
Alan Viverette
4625cac938
am cb2cf8aa
: am b371444b
: am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit 'cb2cf8aa4375fc6ba0abf9abffeafebeeb0964e1':
Fix caption settings picker layouts
2013-10-09 13:34:26 -07:00
Alan Viverette
cb2cf8aa43
am b371444b
: am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit 'b371444b2fee94045ea97c7f4e97a08610595d61':
Fix caption settings picker layouts
2013-10-09 13:31:04 -07:00
Alan Viverette
b371444b2f
am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit '16ad57483d7bba6f5c05ffd64431a900c400eff5':
Fix caption settings picker layouts
2013-10-09 13:29:08 -07:00
Alan Viverette
16ad57483d
Merge "Fix caption settings picker layouts" into klp-dev
2013-10-09 20:25:09 +00:00
David Christie
6207fc6aef
Change location settings icons from crosshair to pin
...
-b/8142654
Change-Id: I4c0b6aeb56a9a100c2869032bb09dc11cc66dcea
2013-10-09 10:27:10 -07:00
Nick Kralevich
a5418e33e3
Fix build.
...
I have no idea if this is an appropriate change, but it's the
smallest patch I could come up with that lets the code compile.
Change-Id: I363386a23cd70f7a1207c5711d2e4b92e8e23937
2013-10-09 08:57:19 -07:00
Alan Viverette
954fd32047
Fix caption settings picker layouts
...
BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
2013-10-08 15:33:00 -07:00
Baligh Uddin
5faedbfb72
Import translations. DO NOT MERGE
...
Change-Id: Ia0bfc7802cee3463b0ea003fa23a41ac948065cf
Auto-generated-cl: translation import
2013-10-07 19:06:16 -07:00
Baligh Uddin
b49c9a49d5
Import translations. DO NOT MERGE
...
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
2013-10-07 19:02:02 -07:00
Baligh Uddin
275f7679d0
Import translations. DO NOT MERGE
...
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
2013-10-07 18:55:29 -07: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
Baligh Uddin
03da98f21f
Merge "Import translations. DO NOT MERGE"
2013-10-05 03:38:22 +00:00
Baligh Uddin
8aecb7cea0
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-05 03:37:55 +00:00
Baligh Uddin
39529d4672
Import translations. DO NOT MERGE
...
Change-Id: I6b8001b3f2fcb88b547b79b020472fa62d2e70c9
Auto-generated-cl: translation import
2013-10-04 18:48:30 -07:00
Baligh Uddin
f2b4a7dd37
Import translations. DO NOT MERGE
...
Change-Id: I97e1bf2ace031bcf591507987bd5d6ae9c6160fd
Auto-generated-cl: translation import
2013-10-04 18:40:44 -07:00
Ari Sachter-Zeltzer
9e22dac053
am 0cccd8b3
: am 916a50db
: am 0a9d037b
: updated launcher settings icon to gray gear
...
* commit '0cccd8b3b887023c1400203ca8f9a743931cfaa4':
updated launcher settings icon to gray gear
2013-10-04 17:36:38 -07:00
Ari Sachter-Zeltzer
0cccd8b3b8
am 916a50db
: am 0a9d037b
: updated launcher settings icon to gray gear
...
* commit '916a50dbabd4a1c775e92518eaf43bd555ceef00':
updated launcher settings icon to gray gear
2013-10-04 15:55:39 -07:00
Ari Sachter-Zeltzer
916a50dbab
am 0a9d037b
: updated launcher settings icon to gray gear
...
* commit '0a9d037bed992adda30da67e95b8cad1904f954c':
updated launcher settings icon to gray gear
2013-10-04 15:53:50 -07:00
Ari Sachter-Zeltzer
0a9d037bed
updated launcher settings icon to gray gear
...
fixes b/10788190
Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa
2013-10-04 21:48:02 +00: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
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
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
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
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
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
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
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
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 Christie
5e89a79c1f
am d0217f0f
: 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 GP
...
* commit 'd0217f0f88a692519a95768321c3923e97032530':
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 20:59:19 -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
Maggie Benthall
490e072c84
Merge "UX tweaks for CA cert monitoring" into klp-dev
2013-10-01 15:45:25 +00: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