Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,988 Commits 1 Branch 0 Tags
46eb69ac798895daf19bd1be534bc6af4f8cb580
Commit Graph

25988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
46eb69ac79 Merge "Show "no vpns added" for empty vpn screen" into nyc-dev am: d0979a5 
am: 8af9a74

* commit '8af9a7452948be260ac6fcb7f0230b0f347a6aee':
  Show "no vpns added" for empty vpn screen
 2016-03-17 19:32:35 +00:00
Christopher Tate
dafe12ac4a Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev am: 8b90b39 
am: ecd0f41

* commit 'ecd0f417efdda8a4ff18f60733be3813285c3dff':
  Don't crash if the backup transport supplies bogus intents
 2016-03-17 19:32:35 +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
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
Robin Lee
d0979a540b Merge "Show "no vpns added" for empty vpn screen" into nyc-dev 2016-03-16 21:30:54 +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
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
Sudheer Shanka
f440bad9a2 Merge "Don\'t set useAdminDisabledSummary when there is already a summary." into nyc-dev am: 24ec9e8 
am: 5dfe728

* commit '5dfe72854f75ba5cf319fd8d3e0ea8d2d4fb31d6':
  Don't set useAdminDisabledSummary when there is already a summary.
 2016-03-16 18:58:29 +00: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
6af2af0fd7 Merge "String and accessibility changes." into nyc-dev am: bfde3fd 
am: 9adb7bd

* commit '9adb7bd370f3a93dee950531cfa62affc930b1e4':
  String and accessibility changes.
 2016-03-16 17:18:35 +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
24391e2009 Import translations. DO NOT MERGE am: 0af50ae -s ours 
am: 632ea87  -s ours

* commit '632ea87dbd9018b5582fae199e386a268051654b':
  Import translations. DO NOT MERGE
 2016-03-16 15:46:32 +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
3bd5c56143 Merge "Add Up button in Status settings" am: aca67a3 
am: 9141fb3

* commit '9141fb30c343efeb9c69244aad67bffb1e02189a':
  Add Up button in Status settings
 2016-03-16 14:11:01 +00: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
Geoff Mendal
0ab1b3f3ed Import translations. DO NOT MERGE 
Change-Id: I3dc791a428e410cde328132cc8e4f0d3db70f008
Auto-generated-cl: translation import
 2016-03-16 06:34:18 -07: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
cc675b1afd Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev am: 1a1ad649c2 
am: da475c53d3

* commit 'da475c53d325cf41be4aa99a6de686bacd63c648':
  Fix description of MTP option in the "Use USB for" dialog.
 2016-03-16 02:07:05 +00: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
091a921a49 Merge "Fix NotificationLockscreenPreference" into nyc-dev am: af0d3952c8 
am: a7737f6df9

* commit 'a7737f6df9da67c4a284e8afe2632b16867360e1':
  Fix NotificationLockscreenPreference
 2016-03-15 23:49:07 +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
6e95a2991c Merge "Update user capabilities in onResume." into nyc-dev am: f6c5128763 
am: 5d5cb14e3d

* commit '5d5cb14e3d8b516440f1dd5d032a8e3364b7ade9':
  Update user capabilities in onResume.
 2016-03-15 23:41:37 +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
273b5d7af2 Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev am: 023f7033ef 
am: fe87ed9d40

* commit 'fe87ed9d406be2fa5ebe33f0213d66d77925b629':
  settings: Fix more NPEs when bluetooth is missing.
 2016-03-15 21:05:53 +00:00
mariagpuyol
ba2e8e5516 Merge "Dialog for emergency info" into nyc-dev am: 82c512dbd6 
am: 6bfdd3a973

* commit '6bfdd3a97342fc72113274082eb94609be0f5039':
  Dialog for emergency info
 2016-03-15 21:05:53 +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
471233b9aa Change magnification strings and accessibility traversal order in preview pane. Bug: 27499075 Bug: 27326035 am: a1a11d1944 
am: 396c52c917

* commit '396c52c917aee3fbbc1435f7afceaefb20044783':
  Change magnification strings and accessibility traversal order in preview pane. Bug: 27499075 Bug: 27326035
 2016-03-15 17:53:08 +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
e772451bab 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 
am: fc9a20425a

* commit 'fc9a20425ac51d11fd6e8b698e0fd79e731cc359':
  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:27:24 +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
cec2040d85 Merge "Fix data usage" into nyc-dev am: 0ee49040b3 
am: d200425210

* commit 'd200425210debaac72c03e7d216508084a91fd25':
  Fix data usage
 2016-03-15 15:45:42 +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
09f362c08c Import translations. DO NOT MERGE am: 0f246eb0ec -s ours 
am: 0a73833f10  -s ours

* commit '0a73833f10267d276450c02d733a066579be7d37':
  Import translations. DO NOT MERGE
 2016-03-15 13:35:36 +00:00