PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,948 Commits 1 Branch 0 Tags
ba2e8e5516bbb27d21647e3523df7513e2041907
Commit Graph

25948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Geoff Mendal
0a7ef03e1b Import translations. DO NOT MERGE 
Change-Id: I1588e8e5553d016671ec7fb17b524ea585af65ae
Auto-generated-cl: translation import
 2016-03-15 06:18:19 -07:00
pkanwar
6013af7ed0 Remove band preference in WiFi settings. Bug: b/25743379 am: 68d1ca6de5 
am: 53145acbe7

* commit '53145acbe7246ea23a8ad0951e7ebf127e9f90a7':
  Remove band preference in WiFi settings. Bug: b/25743379
 2016-03-15 01:23:11 +00: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
pkanwar
68d1ca6de5 Remove band preference in WiFi settings. 
Bug: b/25743379

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

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

* commit 'b279d383b55f89f5985627c917b749e3af108dff':
  Adjusts layout on encryption interstitial.
 2016-03-14 18:18:53 +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
47eb9c90af Revert "Import translations. DO NOT MERGE" am: 0bd0bb04b2 -s ours 
am: 4e4326fc14  -s ours

* commit '4e4326fc144171c907a054edb93d9369f23a9ba4':
  Revert "Import translations. DO NOT MERGE"
 2016-03-14 16:36:58 +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
5fec9de5ae Merge "Revert "Import translations. DO NOT MERGE"" 2016-03-14 16:27:30 +00:00
Geoff Mendal
ffdeb16f53 Revert "Import translations. DO NOT MERGE" 
This reverts commit 1ab931d399.

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

* commit '8384d50f9c34fc1a13c0385ac6dff692ea11f37e':
  Import translations. DO NOT MERGE
 2016-03-14 14:50:29 +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
Geoff Mendal
1ab931d399 Import translations. DO NOT MERGE 
Change-Id: I7ce7d26b21ad0f9dece6073bcb2c214c265f2b78
Auto-generated-cl: translation import
 2016-03-14 06:32:59 -07:00
mariagpuyol
ae49edbdfd Dialog for emergency info 
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
 2016-03-11 21:06:23 -08:00
Mihai Nita
1cf4931211 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev am: 42734c1551 
am: 1705a15e29

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

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

* commit '2377d3c6b08de5c5f8faedcef6c53f1e5be25988':
  Remove band preference in WiFi settings. Bug: b/25743379
 2016-03-12 00:15:37 +00: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
Udam Saini
01c581b9bd Adjusts layout on encryption interstitial. 
This adds extra spacing needed now that there is a divider between
the description and the first selected item. Also adds icons for
the encryption interstitial.

bug:27306696
Change-Id: I0952d543ad121b0dfee5c052a67ca042d381f930
 2016-03-11 15:36:36 -08:00
Mihai Niță
42734c1551 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev 2016-03-11 22:05:18 +00:00
Paul Lawrence
0ca47e2c55 Merge "Don't show secure startup options and strings when file encrypted" into nyc-dev 2016-03-11 21:49:16 +00:00
Paul Lawrence
23c2acfd4c Don't show secure startup options and strings when file encrypted 
File encryption is secure by default, so we don't need to warn.

Bug: 27433949
Bug: 27435082

Change-Id: I3e856256188e6a7dcd58cabbde043395c314999e
 2016-03-11 13:28:39 -08:00
Mihai Nita
d3062b90c1 Settings: change "Language & input" to -> "Languages & input" 
Because now the user can select more than one locale.

Bug: 26849449

Change-Id: I7927fb53012444afafe327e7103ada8ae9808dac
 2016-03-11 12:42:59 -08:00
Pankaj Kanwar
856e72d3d5 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev 2016-03-11 20:38:11 +00:00
Bill Yi
466eb1a829 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 57ab609aab -s ours 
am: e7de9ec52d  -s ours

* commit 'e7de9ec52d69066c871652818ac13dab737d7d64':
  Import translations. DO NOT MERGE
 2016-03-11 19:07:25 +00:00
Udam Saini
fd17eb4315 Uses recycler view to add a line at the top in the intro 
Also, adjusts the divider insets as appropriate for settings and setup
wizard.

bug:27591940
Change-Id: I7aeefd6d1bfe94c97f686e81bc045d31e878655f
 2016-03-11 10:43:06 -08:00