mariagpuyol
251e7dc996
Merge "Remove emergency info subtitle" into nyc-dev
...
am: db15d8e
* commit 'db15d8e21b54d9a0e57c2e5dca756cc306ee78ff':
Remove emergency info subtitle
2016-03-18 15:43:57 +00:00
Maria Garcia Puyol
db15d8e21b
Merge "Remove emergency info subtitle" into nyc-dev
2016-03-18 15:37:59 +00:00
Abodunrinwa Toki
153ce15c31
Merge "Work challenge background: Fix top padding" into nyc-dev
...
am: 4873230
* commit '487323032638e733d9cec4608838b7727b99232f':
Work challenge background: Fix top padding
2016-03-18 15:37:08 +00:00
Abodunrinwa Toki
4873230326
Merge "Work challenge background: Fix top padding" into nyc-dev
2016-03-18 15:30:01 +00:00
mariagpuyol
1f8665f58a
Remove emergency info subtitle
...
Bug:27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
2016-03-18 08:13:49 -07:00
Maria Garcia Puyol
2aca50b657
Merge "Revert "Dialog for emergency info"" into nyc-dev
...
am: c35b08b
* commit 'c35b08b4b3de8daebbc6974715dbc4a0d4a91c1e':
Revert "Dialog for emergency info"
2016-03-18 15:09:53 +00:00
Maria Garcia Puyol
c35b08b4b3
Merge "Revert "Dialog for emergency info"" into nyc-dev
2016-03-18 15:06:02 +00:00
Maria Garcia Puyol
da497f26d7
Revert "Dialog for emergency info"
...
This reverts commit ae49edbdfd
.
Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
2016-03-17 22:52:44 +00:00
Sudheer Shanka
feed83f7a3
Merge "Fix string typo." into nyc-dev
...
am: d0145cc
* commit 'd0145cc87a0eb2210022793f9d8aaf7f0462fcf9':
Fix string typo.
2016-03-17 21:49:50 +00:00
Xiaohui Chen
a4da11246f
Merge "fix build for ag/887244" into nyc-dev
...
am: e7359ee
* commit 'e7359eee4c3dad9a5acf98ff61c9801dd13d2e8c':
fix build for ag/887244
2016-03-17 21:42:23 +00:00
Sudheer Shanka
d0145cc87a
Merge "Fix string typo." into nyc-dev
2016-03-17 21:41:43 +00:00
Mahaver Chopra
e7359eee4c
Merge "fix build for ag/887244" into nyc-dev
2016-03-17 21:37:20 +00:00
Anna Galusza
a7df8a7c1b
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
...
am: a6b76bc
* commit 'a6b76bc4071c2946d0e809e72552cb1909b264ae':
Add divider below summary text on A11y SUW hub. Bug: 27066012
2016-03-17 21:27:42 +00:00
Anna Galusza
a6b76bc407
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
2016-03-17 21:20:34 +00:00
Anna Galusza
6a2a53e94d
Add divider below summary text on A11y SUW hub.
...
Bug: 27066012
Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
2016-03-17 14:20:02 -07:00
Xiaohui Chen
e4649dde7f
fix build for ag/887244
...
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
2016-03-17 20:41:03 +00:00
Sudheer Shanka
9a958bae30
Fix string typo.
...
Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
2016-03-17 13:18:32 -07:00
Udam Saini
2607f5516c
Merge "Sets the divider style to either for fingerprint." into nyc-dev
...
am: 4c173cb
* commit '4c173cb46effd9d932ebdfb9c1c634edb5bee19d':
Sets the divider style to either for fingerprint.
2016-03-17 20:06:47 +00:00
Udam Saini
4c173cb46e
Merge "Sets the divider style to either for fingerprint." into nyc-dev
2016-03-17 19:59:53 +00:00
Abodunrinwa Toki
af700ec6e0
Work challenge background: Fix top padding
...
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
2016-03-17 18:48:05 +00:00
Mahaver Chopra
36e4e7ac10
Merge "Title text and input bar should be white" into nyc-dev
...
am: bef02df
* commit 'bef02df556fd4ea09c416025b67e6769b25a6c4a':
Title text and input bar should be white
2016-03-17 18:19:23 +00:00
Mahaver Chopra
0ed1e25a22
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
...
am: 78a4bcd
* commit '78a4bcd4196450d245adebec15aaae2be2778493':
Work Profile Security Challenge: Finalised strings
2016-03-17 18:19:23 +00:00
Daichi Hirono
9ed9d94ab5
Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev
...
am: 23f4261
* commit '23f4261e3da25d61db73ba8404da9608ba19ccb0':
Use CheckableLinearLayout for Use USB for dialog's item.
2016-03-17 18:19:23 +00:00
Meng Wang
96f2194480
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
...
am: 2ccf1fd
* commit '2ccf1fd7c90b75f1cbf9a4639af926d16d50ca2e':
Show ICCID in SIM status, if CarrierConfigManager allows.
2016-03-17 18:19:23 +00:00
Robin Lee
8af9a74529
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
...
am: d0979a5
* commit 'd0979a540b158485a7766e3466589f6cf171d2a7':
Show "no vpns added" for empty vpn screen
2016-03-17 18:19:23 +00:00
Mahaver Chopra
bef02df556
Merge "Title text and input bar should be white" into nyc-dev
2016-03-17 17:49:34 +00:00
Mahaver Chopra
78a4bcd419
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
2016-03-17 17:48:35 +00:00
Daichi Hirono
23f4261e3d
Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev
2016-03-17 10:05:49 +00:00
Daichi Hirono
9300eb1b14
Use CheckableLinearLayout for Use USB for dialog's item.
...
The root of "Use USB for" dialog's item is CheckableLinearLayout, which
defers the check state to direct children. However previously we had
CheckedTextView not just under CheckableLinearLayout. The structure
looks like:
Root CheckableLinearLayout -> LinearLayout -> CheckedTextView
The CL replaces the second child LinearLayout with CheckableLinearLayout
so that we can defer the state to CheckedTextView.
BUG=27708922
Change-Id: If0491235eac0a82bcb07e31856aa6b9535930fb2
2016-03-17 15:57:36 +09:00
Meng Wang
2ccf1fd7c9
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
2016-03-16 23:24:40 +00:00
Robin Lee
d0979a540b
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
2016-03-16 21:30:54 +00:00
Robin Lee
eb034eb65e
Show "no vpns added" for empty vpn screen
...
Removed the left-alignment on restricted empty views which was
inherited from Bluetooth settings but inconsistent with normal
settings fragments.
Bug: 22685111
Change-Id: I3a36c47d523392b8925031d4cac2ab3ef681e360
2016-03-16 20:28:52 +00:00
Mahaver Chopra
c63ef946d4
Title text and input bar should be white
...
Bug: 27147209
Change-Id: I428ae98ef60db22d50305df39d8d16e63bd5e14f
2016-03-16 17:42:24 +00:00
Mahaver Chopra
8b06553a27
Work Profile Security Challenge: Finalised strings
...
Bug: 25601630
Change-Id: I388fba7dc08196faed35f2e990d558d22a6bbaa4
2016-03-16 17:28:58 +00:00
Julia Reynolds
9adb7bd370
Merge "String and accessibility changes." into nyc-dev
...
am: bfde3fd
* commit 'bfde3fd0852364e957e1f98279ff19272df21894':
String and accessibility changes.
2016-03-16 17:14:12 +00:00
Julia Reynolds
bfde3fd085
Merge "String and accessibility changes." into nyc-dev
2016-03-16 17:04:15 +00:00
Julia Reynolds
017ae508a0
String and accessibility changes.
...
Bug: 27490367
Bug: 27491350
Bug: 27655047
Bug: 24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
2016-03-16 11:40:54 -04:00
Geoff Mendal
0af50ae581
Import translations. DO NOT MERGE
...
Change-Id: I37a8ba55bb9cd820668fc367e1d2ba8ee07b09ee
Auto-generated-cl: translation import
2016-03-16 07:43:55 -07:00
Daichi Hirono
da475c53d3
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
...
am: 1a1ad649c2
* commit '1a1ad649c20b94204daaae23ffd060ba52025216':
Fix description of MTP option in the "Use USB for" dialog.
2016-03-16 02:04:32 +00:00
Daichi Hirono
1a1ad649c2
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
2016-03-16 01:59:44 +00:00
mariagpuyol
6bfdd3a973
Merge "Dialog for emergency info" into nyc-dev
...
am: 82c512dbd6
* commit '82c512dbd6072d21d00677a96cd015d20d1a952d':
Dialog for emergency info
2016-03-15 21:00:32 +00:00
Maria Garcia Puyol
82c512dbd6
Merge "Dialog for emergency info" into nyc-dev
2016-03-15 20:52:17 +00:00
Udam Saini
0cf2502c10
Sets the divider style to either for fingerprint.
...
This keeps the divider style to match the rest of settings.
bug:27619572
Change-Id: Ieef37adae119311106d47321b7f3495446d5da7d
2016-03-15 13:44:05 -07:00
Anna Galusza
396c52c917
Change magnification strings and accessibility traversal order in preview pane. Bug: 27499075 Bug: 27326035
...
am: a1a11d1944
* commit 'a1a11d1944af1bdc0ec6005d363652743edf1f50':
Change magnification strings and accessibility traversal order in preview pane. Bug: 27499075 Bug: 27326035
2016-03-15 17:50:09 +00:00
Anna Galusza
a1a11d1944
Change magnification strings and accessibility traversal order in preview pane.
...
Bug: 27499075
Bug: 27326035
Change-Id: I03ff9574d845a1c2573aa6f4f2462851c56b3c04
2016-03-15 10:22:33 -07:00
Anna Galusza
fc9a20425a
Merge "Add screen for turning TalkBack on and off and remove intent to launch TB tutorial from SUW. Also fix how Fragments are displayed (Fragment Views were being inflated incorrectly causing bugs like the one where TB would still see the hub elements on child screens) and remove ripple from non-selectable text. Bug: 27203716 Bug: 27218687 Bug: 27066012 Bug: 27587193" into nyc-dev
...
am: b740f34f72
* commit 'b740f34f72dee83c52a7c5539bb9fb3bf3ad079a':
Add screen for turning TalkBack on and off and remove intent to launch TB tutorial from SUW. Also fix how Fragments are displayed (Fragment Views were being inflated incorrectly causing bugs like the one where TB would still see the hub elements on child screens) and remove ripple from non-selectable text. Bug: 27203716 Bug: 27218687 Bug: 27066012 Bug: 27587193
2016-03-15 17:22:31 +00:00
Anna Galusza
b740f34f72
Merge "Add screen for turning TalkBack on and off and remove intent to launch TB tutorial from SUW. Also fix how Fragments are displayed (Fragment Views were being inflated incorrectly causing bugs like the one where TB would still see the hub elements on child screens) and remove ripple from non-selectable text. Bug: 27203716 Bug: 27218687 Bug: 27066012 Bug: 27587193" into nyc-dev
2016-03-15 17:09:34 +00:00
Geoff Mendal
0f246eb0ec
Import translations. DO NOT MERGE
...
Change-Id: I69ad76180b5179f67a07536afc785d01ac28f92c
Auto-generated-cl: translation import
2016-03-15 06:27:03 -07:00
Daichi Hirono
a7dfcac8d7
Fix description of MTP option in the "Use USB for" dialog.
...
BUG=27150127
Change-Id: Ib5bdd6394ae2a8a64b95ddfc07ccf7bfd0c8f335
2016-03-15 11:20:36 +09:00
Meng Wang
dcd0bf72b8
Show ICCID in SIM status, if CarrierConfigManager allows.
...
Bug: 27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
2016-03-14 17:42:48 -07:00