Commit Graph

25723 Commits

Author SHA1 Message Date
Christopher Tate
ecd0f417ef Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev
am: 8b90b39

* commit '8b90b39c5e222abecd57cc89ccfbca36f52fc38f':
  Don't crash if the backup transport supplies bogus intents
2016-03-17 18:19:23 +00:00
Chris Tate
8b90b39c5e Merge "Don't crash if the backup transport supplies bogus intents" into nyc-dev 2016-03-16 21:14:39 +00:00
Christopher Tate
4a6c259179 Don't crash if the backup transport supplies bogus intents
Preflight the (activity) intents supplied by the transport so that when
clicked, they don't crash the Preference that called startActivity().

Bug 27689847

Change-Id: I7cbdd6077ac74500ecdf9607310727af56d55a3c
2016-03-16 13:45:03 -07:00
Sudheer Shanka
5dfe72854f Merge "Don\'t set useAdminDisabledSummary when there is already a summary." into nyc-dev
am: 24ec9e8

* commit '24ec9e872cac073fa7b21137dd50ec95cadc9823':
  Don't set useAdminDisabledSummary when there is already a summary.
2016-03-16 18:55:02 +00:00
Sudheer Shanka
24ec9e872c Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev 2016-03-16 18:49:26 +00:00
Sudheer Shanka
b3dc3f2983 Don't set useAdminDisabledSummary when there is already a summary.
Bug: 27155568
Change-Id: If2a7bf127307731b2e2258dc6389caed13950f79
2016-03-16 11:42:58 -07: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
Geoff Mendal
632ea87dbd Import translations. DO NOT MERGE
am: 0af50ae  -s ours

* commit '0af50ae5810a36adb2df39773dcd43891969f06f':
  Import translations. DO NOT MERGE
2016-03-16 15:44:11 +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
Carsten Hauge
9141fb30c3 Merge "Add Up button in Status settings"
am: aca67a3

* commit 'aca67a3c43e9a88cc9abff6a2db1ac9d21856b5c':
  Add Up button in Status settings
2016-03-16 14:08:30 +00:00
Jason Monk
aca67a3c43 Merge "Add Up button in Status settings" 2016-03-16 14:01:24 +00:00
Carsten Hauge
ce42dfb33d Add Up button in Status settings
The Up button should be added in Status settings
(Settings > About phone > Status) to provide consistent navigation
with other screen like Legal information.

Change-Id: I914df08cc4034d78d345a0958b1820e8933f85e7
2016-03-16 14:48:32 +09: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
Adrian Roos
a7737f6df9 Merge "Fix NotificationLockscreenPreference" into nyc-dev
am: af0d3952c8

* commit 'af0d3952c803ac1e654b4f49c2829dadf9a5ef06':
  Fix NotificationLockscreenPreference
2016-03-15 23:46:16 +00:00
Adrian Roos
af0d3952c8 Merge "Fix NotificationLockscreenPreference" into nyc-dev 2016-03-15 23:43:21 +00:00
Sudheer Shanka
5d5cb14e3d Merge "Update user capabilities in onResume." into nyc-dev
am: f6c5128763

* commit 'f6c5128763c3bbcd71c3a58020132929099e844a':
  Update user capabilities in onResume.
2016-03-15 23:39:17 +00:00
Sudheer Shanka
f6c5128763 Merge "Update user capabilities in onResume." into nyc-dev 2016-03-15 23:32:26 +00:00
Prathmesh Prabhu
fe87ed9d40 Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev
am: 023f7033ef

* commit '023f7033ef114c8f3e57d0178ae2583289f5709a':
  settings: Fix more NPEs when bluetooth is missing.
2016-03-15 21:00:33 +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
Prathmesh Prabhu
023f7033ef Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev 2016-03-15 20:54:44 +00:00
Maria Garcia Puyol
82c512dbd6 Merge "Dialog for emergency info" into nyc-dev 2016-03-15 20:52:17 +00: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
Jason Monk
d200425210 Merge "Fix data usage" into nyc-dev
am: 0ee49040b3

* commit '0ee49040b3271e5297d9a7848978bc62a894c714':
  Fix data usage
2016-03-15 15:43:25 +00:00
Jason Monk
0ee49040b3 Merge "Fix data usage" into nyc-dev 2016-03-15 15:39:19 +00:00
Jason Monk
5ce4345dff Fix data usage
- Fix int conversion (evidently a month doesn't fit in an int
 - Remove gaps because they don't make sense for data usage

Bug: 27632250
Change-Id: I87c2c05960b6ee489289e94eb12de9d52de1f3aa
2016-03-15 11:36:06 -04:00
Geoff Mendal
0a73833f10 Import translations. DO NOT MERGE
am: 0f246eb0ec  -s ours

* commit '0f246eb0eced98101046d785452bdfd9c6dbcffa':
  Import translations. DO NOT MERGE
2016-03-15 13:33:19 +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
Adrian Roos
e6d60877b2 Fix NotificationLockscreenPreference
Remote-Input-on-Lockscreen setting was inverted.

Bug: 27638447
Change-Id: I4ca17854dae7c6a47e4fe22be2e862e96742f457
2016-03-14 23:08:40 -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
pkanwar
53145acbe7 Remove band preference in WiFi settings. Bug: b/25743379
am: 68d1ca6de5

* commit '68d1ca6de59b6ff53b49a7684c61bb6f38a65824':
  Remove band preference in WiFi settings. Bug: b/25743379
2016-03-15 01:20:20 +00:00
Sudheer Shanka
aa524ae581 Update user capabilities in onResume.
Bug: 27641648
Change-Id: I85a6362a20885defa450760a3fbb16e124630434
2016-03-14 17:23:13 -07:00
pkanwar
68d1ca6de5 Remove band preference in WiFi settings.
Bug: b/25743379

Change-Id: Id330e2bb59a4a03479603a90c206662d3e3c5068
2016-03-14 21:05:56 +00:00
Udam Saini
d84ac5f20d Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev
am: e0a235cf07

* commit 'e0a235cf071446f07e09253f3a4e44c49441897a':
  Uses recycler view to add a line at the top in the intro
2016-03-14 18:14:04 +00:00
Udam Saini
b279d383b5 Merge "Adjusts layout on encryption interstitial." into nyc-dev
am: 6ea990a7e0

* commit '6ea990a7e037a8082575d15a0e00be8255d0b3c3':
  Adjusts layout on encryption interstitial.
2016-03-14 18:14:04 +00:00
Udam Saini
e0a235cf07 Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev 2016-03-14 17:42:16 +00:00
Udam Saini
6ea990a7e0 Merge "Adjusts layout on encryption interstitial." into nyc-dev 2016-03-14 17:42:08 +00:00
Geoff Mendal
4e4326fc14 Revert "Import translations. DO NOT MERGE"
am: 0bd0bb04b2  -s ours

* commit '0bd0bb04b2a39767d5a2dc1f6c4abfb53954cc5d':
  Revert "Import translations. DO NOT MERGE"
2016-03-14 16:34:52 +00:00
Geoff Mendal
0bd0bb04b2 Revert "Import translations. DO NOT MERGE"
This reverts commit 920745e780.

Change-Id: Ib5e8de4dc7c0583c77f355ba038e6952a99b3988
2016-03-14 16:27:44 +00:00
Geoff Mendal
8384d50f9c Import translations. DO NOT MERGE
am: 920745e780  -s ours

* commit '920745e7804c690249401d5b44875cd00b76b83c':
  Import translations. DO NOT MERGE
2016-03-14 14:48:38 +00:00
Geoff Mendal
920745e780 Import translations. DO NOT MERGE
Change-Id: If2ae5423dae2e4f4c9128fea6f37f5483ba754a5
Auto-generated-cl: translation import
2016-03-14 07:42:45 -07:00
mariagpuyol
ae49edbdfd Dialog for emergency info
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
2016-03-11 21:06:23 -08:00
Mihai Nita
1705a15e29 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
am: 42734c1551

* commit '42734c1551dfac552376efad685f0215724ab518':
  Settings: change "Language & input" to -> "Languages & input"
2016-03-12 00:07:07 +00:00
Paul Lawrence
bd34670f3b Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev
am: 0ca47e2c55

* commit '0ca47e2c5506d286469f29c25e5d45a45623e20f':
  Don't show secure startup options and strings when file encrypted
2016-03-12 00:07:06 +00:00
pkanwar
2377d3c6b0 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev
am: 856e72d3d5

* commit '856e72d3d507d3f644a3fd6410b18d4b68b15953':
  Remove band preference in WiFi settings. Bug: b/25743379
2016-03-12 00:07:06 +00:00