Commit Graph

22666 Commits

Author SHA1 Message Date
Jason Monk
e09535541d am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
  Update disable dialog
2015-06-22 16:07:16 +00:00
Geoff Mendal
59558bdad7 am cb35e5a7: (-s ours) am e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cb35e5a718f8c716dc476d13ad0f39c1815f87d0':
  Import translations. DO NOT MERGE
2015-06-22 15:54:29 +00:00
Jason Monk
591aa6ae9e am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev
* commit 'd8c811d8b80d251630303afda518c8407424abae':
  Update disable dialog
2015-06-22 15:54:26 +00:00
Geoff Mendal
cb35e5a718 am e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e4841b38d05eba058061651b11020c551a014914':
  Import translations. DO NOT MERGE
2015-06-22 15:38:50 +00:00
Geoff Mendal
e4841b38d0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 15:31:26 +00:00
Jason Monk
d8c811d8b8 am b4b590d1: Merge "Update disable dialog" into mnc-dev
* commit 'b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
  Update disable dialog
2015-06-22 15:02:15 +00:00
Geoff Mendal
b593d12bea Import translations. DO NOT MERGE
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
2015-06-22 08:00:38 -07:00
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Geoff Mendal
e3ad3140aa Import translations. DO NOT MERGE
Change-Id: Ifbdf3a7393773c14c7336c62c9935eea02353f1c
Auto-generated-cl: translation import
2015-06-22 07:23:59 -07:00
Pavel Zhamaitsiak
8e3ce3da36 am bfa2bf65: am a8491f34: am 5a6d17c8: Log WiFi Calling actions from settings
* commit 'bfa2bf654b3391349f8e16d846df45da2177192a':
  Log WiFi Calling actions from settings
2015-06-22 04:06:20 +00:00
Pavel Zhamaitsiak
bfa2bf654b am a8491f34: am 5a6d17c8: Log WiFi Calling actions from settings
* commit 'a8491f348ef1a1f10278a83bb33b2b38723fb30c':
  Log WiFi Calling actions from settings
2015-06-22 03:54:39 +00:00
Pavel Zhamaitsiak
a8491f348e am 5a6d17c8: Log WiFi Calling actions from settings
* commit '5a6d17c8cdb099b8533fb4c12c23d31da4bafe41':
  Log WiFi Calling actions from settings
2015-06-22 03:43:31 +00:00
Pavel Zhamaitsiak
5a6d17c8cd Log WiFi Calling actions from settings
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
2015-06-20 15:49:08 -07:00
Adrian Roos
952471b0e3 am e14151f9: am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
  Work around improper ListView recycling in TrustAgentSettings
2015-06-20 05:44:35 +00:00
Selim Cinek
23731e5339 am d49930c2: am e4daef16: am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
* commit 'd49930c28f9c1724fefb7cc986e6ddd5a060b1bd':
  Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 05:44:33 +00:00
Adrian Roos
e14151f9c9 am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
* commit '5023c89d24723f1fc8e5b176fab476d80484b974':
  Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:41:02 +00:00
Selim Cinek
d49930c28f am e4daef16: am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
* commit 'e4daef16c573913fdac8aaf79acb0754004d53d5':
  Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 03:41:01 +00:00
Adrian Roos
5023c89d24 am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
  Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:28:00 +00:00
Selim Cinek
e4daef16c5 am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
* commit '5f0976a0ac1054d59133e6f5661b50c4e9dcecfe':
  Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 03:27:59 +00:00
Adrian Roos
a029671bfd Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 2015-06-20 03:23:03 +00:00
Selim Cinek
5f0976a0ac Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev 2015-06-20 03:21:21 +00:00
Adrian Roos
ba59f5b222 Work around improper ListView recycling in TrustAgentSettings
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.

Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
2015-06-19 20:01:56 -07:00
Robin Lee
b745831e3f am 645c4e32: am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '645c4e327cda52b5dbc9560aece66edb075d7658':
  Only unregister the network callback at onPause
2015-06-19 21:40:34 +00:00
Robin Lee
645c4e327c am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '02a0cf3ae32a272eff23364f8202f6086fabd28e':
  Only unregister the network callback at onPause
2015-06-19 21:23:00 +00:00
Selim Cinek
f4a305ee40 Fixed a crash when rotating the Fingerprint renaming dialog
Bug: 21815069
Change-Id: Ice90a5786685c300a522a908c1107af9e5311eb3
2015-06-19 13:15:13 -07:00
Robin Lee
02a0cf3ae3 am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev
* commit '3a839be7c165ea152179fb5b4531f4f6fdb7c822':
  Only unregister the network callback at onPause
2015-06-19 20:10:51 +00:00
Robin Lee
3a839be7c1 Merge "Only unregister the network callback at onPause" into mnc-dev 2015-06-19 20:03:06 +00:00
Jason Monk
0591282f2a am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
  Add content description to owner info status text
2015-06-19 16:26:37 +00:00
John Spurlock
7eb1906fcc am 5a148d1b: am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '5a148d1bc210256c74d45e25cae59f5eb27c931b':
  Settings: Add widget entry point to magical entry points listing.
2015-06-19 16:26:36 +00:00
Jason Monk
9c4c45b340 am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit '6a7c756208555a41b4433b3a0ce12ef1c101215c':
  Add content description to owner info status text
2015-06-19 16:15:37 +00:00
John Spurlock
5a148d1bc2 am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit 'b9ea1310441d8602b4a51e1c1746e88e45dbc745':
  Settings: Add widget entry point to magical entry points listing.
2015-06-19 16:15:25 +00:00
Jason Monk
6a7c756208 am d63e6969: Merge "Add content description to owner info status text" into mnc-dev
* commit 'd63e696902cbefaa7361aaa16e6b20d0fe593cdb':
  Add content description to owner info status text
2015-06-19 15:33:37 +00:00
Jason Monk
d63e696902 Merge "Add content description to owner info status text" into mnc-dev 2015-06-19 15:22:21 +00:00
Jason Monk
2e78f53af1 Add content description to owner info status text
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
2015-06-19 11:17:03 -04:00
John Spurlock
b9ea131044 am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
* commit '7699cad0042b8bc8cf3cd5ca728f013abe175de8':
  Settings: Add widget entry point to magical entry points listing.
2015-06-19 15:03:16 +00:00
John Spurlock
7699cad004 Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev 2015-06-19 14:55:11 +00:00
John Spurlock
533a5664da Settings: Add widget entry point to magical entry points listing.
Bug: 21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
2015-06-19 10:47:36 -04:00
Brian Carlstrom
be12161f9e am 34e39e7c: am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '34e39e7cff699c9fb38c3d92276099ef99e97de8':
  Clarify process_dex2oat_label description
2015-06-19 14:18:37 +00:00
Sanket Padawe
aac6357744 am 4ad7f625: am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '4ad7f6254d195bd53369aa7fc5154f70d6fb42c3':
  Increase char limit of the data usage Settings string to 33.
2015-06-19 14:18:35 +00:00
Brian Carlstrom
34e39e7cff am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '9dca3951f6abd2644b899c34c930da0456b7f814':
  Clarify process_dex2oat_label description
2015-06-19 13:59:04 +00:00
Sanket Padawe
4ad7f6254d am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit 'aa10a9ec83a639498a1fe5ff483f05a668cdf773':
  Increase char limit of the data usage Settings string to 33.
2015-06-19 13:58:57 +00:00
Zoltan Szatmary-Ban
5de33f402a Reflect effect of all Wifi editability factors in Settings
Bug: 21427528
Bug: 21150087
Bug: 21612565
Change-Id: I62962a9b3fc1bb9c90be79e133873006da102054
2015-06-19 11:06:37 +01:00
Brian Carlstrom
9dca3951f6 am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev
* commit '2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
  Clarify process_dex2oat_label description
2015-06-19 04:33:16 +00:00
Brian Carlstrom
2567514abc Merge "Clarify process_dex2oat_label description" into mnc-dev 2015-06-19 04:23:08 +00:00
Sanket Padawe
aa10a9ec83 am 5ba90c14: Increase char limit of the data usage Settings string to 33.
* commit '5ba90c148d41ae3f330d7f31de8bced5e21c8727':
  Increase char limit of the data usage Settings string to 33.
2015-06-19 01:51:27 +00:00
Sanket Padawe
5ba90c148d Increase char limit of the data usage Settings string to 33.
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
2015-06-18 18:39:25 -07:00
Jason Monk
8af26277a3 am 8a753643: am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '8a753643058760fb44a286dbf7d198053a3f3a01':
  Fix ListView being too eager too scroll
2015-06-18 20:43:09 +00:00
Jason Monk
8a75364305 am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '5fd5890f5b94d102d7cf655fd0d1dbd9d09dd55f':
  Fix ListView being too eager too scroll
2015-06-18 20:30:36 +00:00
Jason Monk
5fd5890f5b am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev
* commit '47a26c79288723b8604a91c5cd8daedd83f183f2':
  Fix ListView being too eager too scroll
2015-06-18 20:16:51 +00:00
Jason Monk
47a26c7928 Merge "Fix ListView being too eager too scroll" into mnc-dev 2015-06-18 20:07:40 +00:00