Commit Graph

25985 Commits

Author SHA1 Message Date
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
Jason Monk
045e518b55 Fix battery history detail up
Bug: 27476391
Change-Id: I21f2bbbf4306d36ffa1c4825ecaebd45dca50171
2016-03-16 16:29:26 -04: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
Jason Monk
ef6671b0b7 Fix clickability of conditionals
Bug: 27700081
Change-Id: If991419541dd021197ea641f8b2caee5cc16af36
2016-03-16 16:25:09 -04:00
Jason Monk
0d6a574100 Try to recycle prefs in battery summary
Bug: 27404159
Change-Id: I5a71413f22e14b8300b6821da661a613392a06e0
2016-03-16 15:52:35 -04:00
Jason Monk
30ab199536 Don't use animations for security settings
Bug: 27419463
Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2
2016-03-16 15:13:19 -04: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
Jason Monk
d11cca0168 Fix Settings home lifecycle
Bug: 27330440
Bug: 26268813
Change-Id: Ibb3729c9872be2488db3741ec72ba5a43e66db5f
2016-03-16 14:27:12 -04: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
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
Anna Galusza
a9a252ee96 Fix padding on Font size and Display size preview screens.
Bug: 27675989

Change-Id: Iecdc3e8a9aee4fd82a59337f14cbf4bd91587709
2016-03-15 21:48:04 +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
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
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
Meng Wang
dcd0bf72b8 Show ICCID in SIM status, if CarrierConfigManager allows.
Bug: 27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
2016-03-14 17:42:48 -07: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